mirror of
https://github.com/samba-team/samba.git
synced 2025-01-13 13:18:06 +03:00
s3: smbd: Reformatting callers of rename_internals_fsp() to make it easer to see changed parameters.
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
parent
500037f218
commit
614b300301
@ -8061,8 +8061,11 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
status = rename_internals_fsp(conn, fsp, smb_fname_dst,
|
status = rename_internals_fsp(conn,
|
||||||
attrs, replace_if_exists);
|
fsp,
|
||||||
|
smb_fname_dst,
|
||||||
|
attrs,
|
||||||
|
replace_if_exists);
|
||||||
|
|
||||||
close_file(req, fsp, NORMAL_CLOSE);
|
close_file(req, fsp, NORMAL_CLOSE);
|
||||||
|
|
||||||
@ -8229,8 +8232,11 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
status = rename_internals_fsp(conn, fsp, smb_fname_dst,
|
status = rename_internals_fsp(conn,
|
||||||
attrs, replace_if_exists);
|
fsp,
|
||||||
|
smb_fname_dst,
|
||||||
|
attrs,
|
||||||
|
replace_if_exists);
|
||||||
|
|
||||||
close_file(req, fsp, NORMAL_CLOSE);
|
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),
|
DEBUG(3,("reply_mv : %s -> %s\n", smb_fname_str_dbg(smb_fname_src),
|
||||||
smb_fname_str_dbg(smb_fname_dst)));
|
smb_fname_str_dbg(smb_fname_dst)));
|
||||||
|
|
||||||
status = rename_internals(ctx, conn, req, smb_fname_src, smb_fname_dst,
|
status = rename_internals(ctx,
|
||||||
attrs, False, src_has_wcard, dest_has_wcard,
|
conn,
|
||||||
DELETE_ACCESS);
|
req,
|
||||||
|
smb_fname_src,
|
||||||
|
smb_fname_dst,
|
||||||
|
attrs,
|
||||||
|
false,
|
||||||
|
src_has_wcard,
|
||||||
|
dest_has_wcard,
|
||||||
|
DELETE_ACCESS);
|
||||||
if (!NT_STATUS_IS_OK(status)) {
|
if (!NT_STATUS_IS_OK(status)) {
|
||||||
if (open_was_deferred(req->xconn, req->mid)) {
|
if (open_was_deferred(req->xconn, req->mid)) {
|
||||||
/* We have re-scheduled this call. */
|
/* We have re-scheduled this call. */
|
||||||
|
@ -7174,7 +7174,9 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
|
|||||||
"SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
|
"SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
|
||||||
fsp_fnum_dbg(fsp), fsp_str_dbg(fsp),
|
fsp_fnum_dbg(fsp), fsp_str_dbg(fsp),
|
||||||
smb_fname_str_dbg(smb_fname_dst)));
|
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),
|
(FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM),
|
||||||
overwrite);
|
overwrite);
|
||||||
|
|
||||||
@ -7444,17 +7446,26 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
|
|||||||
"SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
|
"SMB_FILE_RENAME_INFORMATION (%s) %s -> %s\n",
|
||||||
fsp_fnum_dbg(fsp), fsp_str_dbg(fsp),
|
fsp_fnum_dbg(fsp), fsp_str_dbg(fsp),
|
||||||
smb_fname_str_dbg(smb_fname_dst)));
|
smb_fname_str_dbg(smb_fname_dst)));
|
||||||
status = rename_internals_fsp(conn, fsp, smb_fname_dst, 0,
|
status = rename_internals_fsp(conn,
|
||||||
overwrite);
|
fsp,
|
||||||
|
smb_fname_dst,
|
||||||
|
0,
|
||||||
|
overwrite);
|
||||||
} else {
|
} else {
|
||||||
DEBUG(10,("smb_file_rename_information: "
|
DEBUG(10,("smb_file_rename_information: "
|
||||||
"SMB_FILE_RENAME_INFORMATION %s -> %s\n",
|
"SMB_FILE_RENAME_INFORMATION %s -> %s\n",
|
||||||
smb_fname_str_dbg(smb_fname_src),
|
smb_fname_str_dbg(smb_fname_src),
|
||||||
smb_fname_str_dbg(smb_fname_dst)));
|
smb_fname_str_dbg(smb_fname_dst)));
|
||||||
status = rename_internals(ctx, conn, req, smb_fname_src,
|
status = rename_internals(ctx,
|
||||||
smb_fname_dst, 0, overwrite, false,
|
conn,
|
||||||
dest_has_wcard,
|
req,
|
||||||
FILE_WRITE_ATTRIBUTES);
|
smb_fname_src,
|
||||||
|
smb_fname_dst,
|
||||||
|
0,
|
||||||
|
overwrite,
|
||||||
|
false,
|
||||||
|
dest_has_wcard,
|
||||||
|
FILE_WRITE_ATTRIBUTES);
|
||||||
}
|
}
|
||||||
out:
|
out:
|
||||||
TALLOC_FREE(smb_fname_dst);
|
TALLOC_FREE(smb_fname_dst);
|
||||||
|
Loading…
Reference in New Issue
Block a user