Deprecate the "share modes" parameter to address bug #6024, swat disagrees with smbst...

Jeremy.

diff --git a/docs-xml/smbdotconf/locking/sharemodes.xml b/docs-xml/smbdotconf/locking/sharemodes.xml
index e8371a563daa9f1ac02908eb68585c2e614a44b3..c529886d33e74f8239aff0c139bd6264c1a1f41a 100644 (file)
--- a/docs-xml/smbdotconf/locking/sharemodes.xml
+++ b/docs-xml/smbdotconf/locking/sharemodes.xml
@@ -3,25 +3,26 @@
                  context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-       <para>This enables or disables the honoring of 
-       the <parameter moreinfo="none">share modes</parameter> during a file open. These 
-       modes are used by clients to gain exclusive read or write access 
+       <para>This enables or disables the honoring of
+       the <parameter moreinfo="none">share modes</parameter> during a file open. These
+       modes are used by clients to gain exclusive read or write access
        to a file.</para>
 
+       <para>This is a deprecated option from old versions of
+       Samba, and will be removed in the next major release.
+       </para>
+
        <para>These open modes are not directly supported by UNIX, so
-       they are simulated using shared memory, or lock files if your 
-       UNIX doesn't support shared memory (almost all do).</para>
+       they are simulated using shared memory.</para>
 
-       <para>The share modes that are enabled by this option are 
-        <constant>DENY_DOS</constant>, <constant>DENY_ALL</constant>,
-       <constant>DENY_READ</constant>, <constant>DENY_WRITE</constant>,
-       <constant>DENY_NONE</constant> and <constant>DENY_FCB</constant>.
+       <para>The share modes that are enabled by this option are
+       the standard Windows share modes.
        </para>
 
-       <para>This option gives full share compatibility and enabled 
+       <para>This option gives full share compatibility and is enabled
        by default.</para>
 
-       <para>You should <emphasis>NEVER</emphasis> turn this parameter 
+       <para>You should <emphasis>NEVER</emphasis> turn this parameter
        off as many Windows applications will break if you do so.</para>
 </description>
 <value type="default">yes</value>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 6c0936a4bc1405e8e90510c4d2fe513849f9cc7f..a874ce29d853847b80789ffc908d35ac05d1594a 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3493,7 +3493,7 @@ static struct parm_struct parm_table[] = {
                .ptr            = &sDefault.bShareModes,
                .special        = NULL,
                .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+               .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL | FLAG_DEPRECATED,
        },
 
        {N_("Ldap Options"), P_SEP, P_SEPARATOR},