diff options
| author | Andreas Schneider <asn@samba.org> | 2012-06-22 16:37:26 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-07-03 21:56:49 +0200 |
| commit | d0878b3b8179b1cf061e1058bacbe670363b51c6 (patch) | |
| tree | 1445c7587c9db1f4b391d225b637e357547916b7 /source3 | |
| parent | 571a4b6cd29a38d90d269871d7c4698a2a0b1d38 (diff) | |
| download | samba-d0878b3b8179b1cf061e1058bacbe670363b51c6.tar.gz samba-d0878b3b8179b1cf061e1058bacbe670363b51c6.tar.bz2 samba-d0878b3b8179b1cf061e1058bacbe670363b51c6.zip | |
s3-smbd: Remove deprecated 'share modes' option.
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 9 | ||||
| -rw-r--r-- | source3/smbd/open.c | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 979bcfe0ce..4080f23738 100644 --- 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 e31c047230..12ba2f1d3b 100644 --- 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 c2bf8edb7a..c88fe65a34 100644 --- 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++) { |