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

Karolin Seeger kseeger at samba.org
Mon Mar 21 19:02:06 UTC 2016


The branch, v4-4-test has been updated
       via  d864232 lib/socket/interfaces: Fix some uninitialied bytes.
       via  5d8c95f build: fix build when --without-quota specified
       via  8ed6376 WHATSNEW: document the experimental smb3-multi-channel feature
      from  356cff2 VERSION: Bump version up to 4.4.0rc6...

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


- Log -----------------------------------------------------------------
commit d864232d83e2b1e4838f5b81d5fd984552741cae
Author: G√ľnther Deschner <gd at samba.org>
Date:   Wed Mar 2 18:32:53 2016 +0100

    lib/socket/interfaces: Fix some uninitialied bytes.
    
    Valgrind reports the following:
    
    ==26599== Syscall param ioctl(SIOCETHTOOL) points to uninitialised byte(s)
    ==26599==    at 0x7014707: ioctl (in /usr/lib64/libc-2.22.so)
    ==26599==    by 0x79D1585: query_iface_speed_from_name (interfaces.c:152)
    ==26599==    by 0x79D1BBA: _get_interfaces (interfaces.c:277)
    ==26599==    by 0x79D1E80: get_interfaces (interfaces.c:368)
    ==26599==    by 0x508A7E3: load_interfaces (interface.c:612)
    ==26599==    by 0x150B30: main (net.c:963)
    ==26599==  Address 0xffefff0d8 is on thread 1's stack
    ==26599==  in frame #1, created by query_iface_speed_from_name
    (interfaces.c:130)
    ==26599==
    ==26599== Syscall param ioctl(SIOCETHTOOL) points to uninitialised byte(s)
    ==26599==    at 0x7014707: ioctl (in /usr/lib64/libc-2.22.so)
    ==26599==    by 0x79D15CC: query_iface_speed_from_name (interfaces.c:164)
    ==26599==    by 0x79D1BBA: _get_interfaces (interfaces.c:277)
    ==26599==    by 0x79D1E80: get_interfaces (interfaces.c:368)
    ==26599==    by 0x508A7E3: load_interfaces (interface.c:612)
    ==26599==    by 0x150B30: main (net.c:963)
    ==26599==  Address 0xffefff0d8 is on thread 1's stack
    ==26599==  in frame #1, created by query_iface_speed_from_name
    (interfaces.c:130)
    
    Guenther
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 2e2f81134c86ef3146781d62d9f561f496b74ee2)
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11802
    lib/socket/interfaces: fix valgrind warning
    
    Autobuild-User(v4-4-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-4-test): Mon Mar 21 20:01:47 CET 2016 on sn-devel-144

commit 5d8c95f386eed2fcb96a83c1333b977e8d12c2c9
Author: Uri Simchoni <uri at samba.org>
Date:   Wed Mar 16 20:20:02 2016 +0200

    build: fix build when --without-quota specified
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11798
    
    Signed-off-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 228ab3466d0e5af46313de200b5b976d46838378)

commit 8ed6376c387741fdc74c187a75944db5b5b8afda
Author: Michael Adam <obnox at samba.org>
Date:   Tue Mar 15 21:56:44 2016 +0100

    WHATSNEW: document the experimental smb3-multi-channel feature
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 WHATSNEW.txt            | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 lib/socket/interfaces.c |  1 +
 source3/wscript         |  4 ++--
 3 files changed, 52 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index b79b35f..4c68739 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -189,6 +189,53 @@ CTDB changes
 * All CTDB current manual pages are now correctly installed
 
 
+EXPERIMENTAL FEATURES
+=====================
+
+SMB3 Multi-Channel
+------------------
+
+Samba 4.4.0 adds *experimental* support for SMB3 Multi-Channel.
+Multi-Channel is an SMB3 protocol feature that allows the client
+to bind multiple transport connections into one authenticated
+SMB session. This allows for increased fault tolerance and
+throughput. The client chooses transport connections as reported
+by the server and also chooses over which of the bound transport
+connections to send traffic. I/O operations for a given file
+handle can span multiple network connections this way.
+An SMB multi-channel session will be valid as long as at least
+one of its channels are up.
+
+In Samba, multi-channel can be enabled by setting the new
+smb.conf option "server multi channel support" to "yes".
+It is disabled by default.
+
+Samba has to report interface speeds and some capabilities to
+the client. On Linux, Samba can auto-detect the speed of an
+interface. But to support other platforms, and in order to be
+able to manually override the detected values, the "interfaces"
+smb.conf option has been given an extended syntax, by which an
+interface specification can additionally carry speed and
+capability information. The extended syntax looks like this
+for setting the speed to 1 gigabit per second:
+
+    interfaces = 192.168.1.42;speed=1000000000
+
+This extension should be used with care and are mainly intended
+for testing. See the smb.conf manual page for details.
+
+CAVEAT: While this should be working without problems mostly,
+there are still corner cases in the treatment of channel failures
+that may result in DATA CORRUPTION when these race conditions hit.
+It is hence
+
+    NOT RECOMMENDED TO USE MULTI-CHANNEL IN PRODUCTION
+
+at this stage. This situation can be expected to improve during
+the life-time of the 4.4 release. Feed-back from test-setups is
+highly welcome.
+
+
 REMOVED FEATURES
 ================
 
@@ -228,6 +275,8 @@ smb.conf changes
   --------------		-----------		-------
   aio max threads               New                     100
   ldap page size		Changed default		1000
+  server multi channel support	New			No
+  interfaces			Extended syntax
 
 
 KNOWN ISSUES
diff --git a/lib/socket/interfaces.c b/lib/socket/interfaces.c
index 2cabf46..dacd118 100644
--- a/lib/socket/interfaces.c
+++ b/lib/socket/interfaces.c
@@ -145,6 +145,7 @@ static void query_iface_speed_from_name(const char *name, uint64_t *speed)
 		goto done;
 	}
 
+	ZERO_STRUCT(ifr);
 	strncpy(ifr.ifr_name, name, IF_NAMESIZE);
 
 	ifr.ifr_data = (void *)&edata;
diff --git a/source3/wscript b/source3/wscript
index f159d54..52f5876 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1374,6 +1374,7 @@ main() {
     conf.CHECK_FUNCS_IN('getspnam', 'security')
     conf.CHECK_FUNCS_IN('getspnam', 'sec')
 
+    legacy_quota_libs = ''
     if Options.options.with_quotas:
         # For quotas on Veritas VxFS filesystems
         conf.CHECK_HEADERS('sys/fs/vx_quota.h')
@@ -1458,7 +1459,6 @@ main() {
         # check if Legacy quota code can be brought in
         # if standard interfaces are not supported
         #
-        legacy_quota_libs = ''
         if not conf.CONFIG_SET('WITH_QUOTAS'):
             if host_os.rfind('sunos5') > -1:
                 conf.DEFINE('SUNOS5', '1')
@@ -1476,7 +1476,7 @@ main() {
                             addmain=False)
             if not conf.CONFIG_SET('WITH_QUOTAS'):
                 legacy_quota_libs = ''
-        conf.env['legacy_quota_libs'] = legacy_quota_libs
+    conf.env['legacy_quota_libs'] = legacy_quota_libs
 
     #
     # cluster support (CTDB)


-- 
Samba Shared Repository



More information about the samba-cvs mailing list