Attachment 7984 Details for Bug 9222 – git-am fix for 3.6.x and 4.0.0rc3.

[patch] git-am fix for 3.6.x and 4.0.0rc3.

0001-Correct-fix-for-bug-9222-smbd-ignores-the-server-sig.patch (text/plain), 2.19 KB, created by Jeremy Allison on 2012-10-03 22:13:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2012-10-03 22:13:11 UTC

Size: 2.19 KB

patch

obsolete

>From a9d940e8cca05e750ca539bb70d3ed9f21d983d1 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 3 Oct 2012 12:58:00 -0700
>Subject: [PATCH] Correct fix for bug #9222 - smbd ignores the "server signing
> = no" setting for SMB2.
>
>Signing cannot be disabled for SMB2 by design, so fix the documentation
>instead.
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Wed Oct  3 23:47:23 CEST 2012 on sn-devel-104
>(cherry picked from commit fe38a93c71d0adc0be1d43b438ac3b54eaf4ba53)
>---
> docs-xml/smbdotconf/security/serversigning.xml |   17 +++++++++++------
> 1 files changed, 11 insertions(+), 6 deletions(-)
>
>diff --git a/docs-xml/smbdotconf/security/serversigning.xml b/docs-xml/smbdotconf/security/serversigning.xml
>index ea21a2c..0aced5d 100644
>--- a/docs-xml/smbdotconf/security/serversigning.xml
>+++ b/docs-xml/smbdotconf/security/serversigning.xml
>@@ -5,14 +5,19 @@
> 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
> <description>
> 
>-    <para>This controls whether the client is allowed or required to use SMB signing. Possible values 
>-    are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis> 
>-    and <emphasis>disabled</emphasis>. 
>+    <para>This controls whether the client is allowed or required to use SMB1 and SMB2 signing. Possible values
>+    are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis>
>+    and <emphasis>disabled</emphasis>.
>     </para>
> 
>-    <para>When set to auto, SMB signing is offered, but not enforced. 
>-    When set to mandatory, SMB signing is required and if set 
>-	to disabled, SMB signing is not offered either.</para>
>+    <para>When set to auto, SMB1 signing is offered, but not enforced.
>+    When set to mandatory, SMB1 signing is required and if set
>+    to disabled, SMB signing is not offered either.</para>
>+
>+    <para>For the SMB2 protocol, by design, signing cannot be disabled. In the case
>+    where SMB2 is negotiated, if this parameter is set to <emphasis>disabled</emphasis>,
>+    it will be treated as <emphasis>auto</emphasis>. Setting it to <emphasis>mandatory</emphasis>
>+    will still require SMB2 clients to use signing.</para>
> </description>
> 
> <value type="default">Disabled</value>
>-- 
>1.7.7.3
>

Flags:

metze: review+

Actions: View

Attachments on bug 9222: 7984