From 04f5dbb168a6b91aecb60ebb398a5f5297b288d5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 8 Aug 2019 14:38:24 -0700 Subject: [PATCH] s3: smbd: Reformatting. Use helper variable for SMB_VFS_RENAME call. Will make replacement with renameat() clearer later. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/smbd/reply.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 5664090f38c..506fe97f71b 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -6929,6 +6929,7 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, struct share_mode_lock *lck = NULL; uint32_t access_mask = SEC_DIR_ADD_FILE; bool dst_exists, old_is_stream, new_is_stream; + int ret; status = check_name(conn, smb_fname_dst_in); if (!NT_STATUS_IS_OK(status)) { @@ -7157,7 +7158,10 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, SMB_ASSERT(lck != NULL); - if(SMB_VFS_RENAME(conn, fsp->fsp_name, smb_fname_dst) == 0) { + ret = SMB_VFS_RENAME(conn, + fsp->fsp_name, + smb_fname_dst); + if (ret == 0) { uint32_t create_options = fsp->fh->private_options; DEBUG(3, ("rename_internals_fsp: succeeded doing rename on " -- 2.47.2