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

Stefan Metzmacher metze at samba.org
Wed Mar 16 08:06:20 UTC 2016


The branch, v4-4-test has been updated
       via  8984b15 smbd: enable multi-channel if 'server multi channel support = yes' in the config
       via  4895c3f param: add parameter "server multi channel support", defaults to off.
      from  40fb6fd selftest: Avoid sorting issues on Ubuntu 10.04 vs 14.04

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


- Log -----------------------------------------------------------------
commit 8984b15a3d54544dc32f3c8cbc3d50cb40e0a6c5
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jan 26 08:16:51 2016 +0100

    smbd: enable multi-channel if 'server multi channel support = yes' in the config
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue Mar 15 20:58:19 CET 2016 on sn-devel-144
    
    (cherry picked from commit e85e4055b940ea3be4e5beb12a62ad448dbbc73d)
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11796
    
    Autobuild-User(v4-4-test): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(v4-4-test): Wed Mar 16 03:16:40 CET 2016 on sn-devel-144

commit 4895c3fb9938c37c4270cb030ba4f09906f4b062
Author: G√ľnther Deschner <gd at samba.org>
Date:   Wed Jan 20 17:44:45 2016 +0100

    param: add parameter "server multi channel support", defaults to off.
    
    Guenther
    
    Pair-Programmed-With: Michael Adam <obnox at samba.org>
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 8a71e1a5a803510f60c8610d06e7868739dc31b1)
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11796

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

Summary of changes:
 .../protocol/servermultichannelsupport.xml          | 21 +++++++++++++++++++++
 source3/smbd/smbXsrv_client.c                       |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 docs-xml/smbdotconf/protocol/servermultichannelsupport.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/protocol/servermultichannelsupport.xml b/docs-xml/smbdotconf/protocol/servermultichannelsupport.xml
new file mode 100644
index 0000000..14db171
--- /dev/null
+++ b/docs-xml/smbdotconf/protocol/servermultichannelsupport.xml
@@ -0,0 +1,21 @@
+<samba:parameter name="server multi channel support"
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>This boolean parameter controls whether
+    <citerefentry><refentrytitle>smbd</refentrytitle>
+    <manvolnum>8</manvolnum></citerefentry> will support
+    SMB3 multi-channel.
+    </para>
+    <para>This parameter has been added with version 4.4.</para>
+    <para>
+    Warning: Note that this feature is considered experimental in Samba 4.4.
+    Use it at your own risk: Even though it may seem to work well in testing,
+    it may result in data corruption under some race conditions.
+    Future 4.4.x release may improve this situation.
+    </para>
+</description>
+
+<value type="default">no</value>
+</samba:parameter>
diff --git a/source3/smbd/smbXsrv_client.c b/source3/smbd/smbXsrv_client.c
index d8ba2f7..7286b6e 100644
--- a/source3/smbd/smbXsrv_client.c
+++ b/source3/smbd/smbXsrv_client.c
@@ -511,6 +511,8 @@ NTSTATUS smbXsrv_client_create(TALLOC_CTX *mem_ctx,
 	client->ev_ctx = ev_ctx;
 	client->msg_ctx = msg_ctx;
 
+	client->server_multi_channel_enabled = lp_server_multi_channel_support();
+
 	client->table = talloc_move(client, &table);
 	table = client->table;
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list