[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  5059c8e vfs_default: unlock the right file in copy chunk
       via  a5c2396 replace: fix some trailing whitespaces
       via  fe149d7 vfs_fruit: fix a typo
      from  35460d9 s3/rpc_server/mdssvc: prefix public flex and bison global symbols

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5059c8e2e3a6159bc2917ddd80d09fab35b39e66
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

commit a5c2396173aabb7ba1c44481a944f2238bc962f9
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Dec 8 18:54:33 2016 +0100

    replace: fix some trailing whitespaces
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: David Disseldorp <ddiss at samba.org>

commit fe149d7b0197e26c53cdbeca67b2d878f831ea9d
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Jan 19 23:49:54 2017 +0100

    vfs_fruit: fix a typo
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: David Disseldorp <ddiss at samba.org>

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

Summary of changes:
 lib/replace/getifaddrs.c      | 20 ++++++++++----------
 source3/modules/vfs_default.c |  2 +-
 source3/modules/vfs_fruit.c   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/getifaddrs.c b/lib/replace/getifaddrs.c
index c2d20f8..9e377e5 100644
--- a/lib/replace/getifaddrs.c
+++ b/lib/replace/getifaddrs.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Samba utility functions
    Copyright (C) Andrew Tridgell 1998
@@ -94,17 +94,17 @@ int rep_getifaddrs(struct ifaddrs **ifap)
 	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
 		return -1;
 	}
-  
+
 	ifc.ifc_len = sizeof(buff);
 	ifc.ifc_buf = buff;
 
 	if (ioctl(fd, SIOCGIFCONF, &ifc) != 0) {
 		close(fd);
 		return -1;
-	} 
+	}
 
 	ifr = ifc.ifc_req;
-  
+
 	n = ifc.ifc_len / sizeof(struct ifreq);
 
 	/* Loop through interfaces, looking for given IP address */
@@ -171,7 +171,7 @@ int rep_getifaddrs(struct ifaddrs **ifap)
 	close(fd);
 
 	return 0;
-}  
+}
 
 #define _FOUND_IFACE_ANY
 #endif /* HAVE_IFACE_IFCONF */
@@ -200,14 +200,14 @@ int rep_getifaddrs(struct ifaddrs **ifap)
 	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
 		return -1;
 	}
-  
+
 	strioctl.ic_cmd = SIOCGIFCONF;
 	strioctl.ic_dp  = buff;
 	strioctl.ic_len = sizeof(buff);
 	if (ioctl(fd, I_STR, &strioctl) < 0) {
 		close(fd);
 		return -1;
-	} 
+	}
 
 	/* we can ignore the possible sizeof(int) here as the resulting
 	   number of interface structures won't change */
@@ -217,16 +217,16 @@ int rep_getifaddrs(struct ifaddrs **ifap)
            at the start of the buffer if the offered size is a
            multiple of the structure size plus an int */
 	if (n*sizeof(struct ifreq) + sizeof(int) == strioctl.ic_len) {
-		ifr = (struct ifreq *)(buff + sizeof(int));  
+		ifr = (struct ifreq *)(buff + sizeof(int));
 	} else {
-		ifr = (struct ifreq *)buff;  
+		ifr = (struct ifreq *)buff;
 	}
 
 	/* Loop through interfaces */
 
 	for (i = 0; i<n; i++) {
 		ifreq = ifr[i];
-  
+
 		curif = calloc(1, sizeof(struct ifaddrs));
 		if (lastif == NULL) {
 			*ifap = curif;
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 4e8605b..d4610f7 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1710,7 +1710,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;
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 605b3e0..9e8a78c 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3807,7 +3807,7 @@ static void fruit_copy_chunk_done(struct tevent_req *subreq)
 	}
 
 	/*
-	 * Now copy all reamining streams. We know the share supports
+	 * Now copy all remaining streams. We know the share supports
 	 * streams, because we're in vfs_fruit. We don't do this async
 	 * because streams are few and small.
 	 */


-- 
Samba Shared Repository