[SCM] Samba Shared Repository - branch v4-4-test updated

Karolin Seeger kseeger at samba.org
Thu Jan 26 11:42:01 UTC 2017


The branch, v4-4-test has been updated
       via  eec4a5d vfs_default: unlock the right file in copy chunk
      from  930667c messaging: Fix dead but not cleaned-up-yet destination sockets

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test


- Log -----------------------------------------------------------------
commit eec4a5d30ced8f8ce89b6c7ca93356664b4e2c8b
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Jan 19 21:51:41 2017 +0100

    vfs_default: unlock the right file in copy chunk
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Sat Jan 21 17:00:54 CET 2017 on sn-devel-144
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12535
    
    (cherry picked from commit 5059c8e2e3a6159bc2917ddd80d09fab35b39e66)
    
    Autobuild-User(v4-4-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-4-test): Thu Jan 26 12:41:13 CET 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_default.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 8838104..bdc0832 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1528,7 +1528,7 @@ static struct tevent_req *vfswrap_copy_chunk_send(struct vfs_handle_struct *hand
 			saved_errno = errno;
 		}
 
-		SMB_VFS_STRICT_UNLOCK(src_fsp->conn, src_fsp, &lck);
+		SMB_VFS_STRICT_UNLOCK(dest_fsp->conn, dest_fsp, &lck);
 
 		if (ret == -1) {
 			errno = saved_errno;


-- 
Samba Shared Repository



More information about the samba-cvs mailing list