]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Reformatting. Use helper variable for SMB_VFS_RENAME call.
authorJeremy Allison <jra@samba.org>
Thu, 8 Aug 2019 21:38:24 +0000 (14:38 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 16 Aug 2019 19:52:31 +0000 (19:52 +0000)
Will make replacement with renameat() clearer later.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/reply.c

index 5664090f38c7cf837a3a4d160b437b5f36f7a030..506fe97f71bd52181eb03fc975ccf39e3b8c5d8a 100644 (file)
@@ -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 "