s3-smbd: Remove deprecated 'share modes' option.

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 979bcfe0ced39e80c805a6c298105ea545cae8ab..4080f2373846e9149a3fa8b85a3d1bc62dc9a1b3 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1298,7 +1298,6 @@ bool lp_dmapi_support(int );
 bool lp_locking(const struct share_params *p );
 int lp_strict_locking(const struct share_params *p );
 bool lp_posix_locking(const struct share_params *p );
-bool lp_share_modes(int );
 bool lp_oplocks(int );
 bool lp_kernel_oplocks(int );
 bool lp_level2_oplocks(int );

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e31c0472301a34a33e6149043aca585d4f778082..12ba2f1d3b9a487a5b14ab82aa5109163af86c2d 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3191,15 +3191,6 @@ static struct parm_struct parm_table[] = {
                .enum_list      = enum_bool_auto,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
        },
-       {
-               .label          = "share modes",
-               .type           = P_BOOL,
-               .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bShareModes),
-               .special        = NULL,
-               .enum_list      = NULL,
-               .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL | FLAG_DEPRECATED,
-       },
 
        {N_("Ldap Options"), P_SEP, P_SEPARATOR},
 

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index c2bf8edb7a6b7a45b60f75d80538614c6ed95d6c..c88fe65a3466f267ece78c90d09a86caa8f17dca 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1038,10 +1038,6 @@ static NTSTATUS open_mode_check(connection_struct *conn,
        }
 #endif
 
-       if (!lp_share_modes(SNUM(conn))) {
-               return NT_STATUS_OK;
-       }
-
        /* Now we check the share modes, after any oplock breaks. */
        for(i = 0; i < lck->data->num_share_modes; i++) {