smb.conf: Remove "share backend" option
authorAndrew Bartlett <abartlet@samba.org>
Wed, 24 Mar 2021 22:50:14 +0000 (11:50 +1300)
committerJeremy Allison <jra@samba.org>
Fri, 26 Mar 2021 03:04:39 +0000 (03:04 +0000)
This is a confusing hold-over from the NTVFS fileserver that never became part of
the merged architecture.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
13 files changed:
docs-xml/smbdotconf/base/sharebackend.xml [deleted file]
lib/param/loadparm.c
source3/param/loadparm.c
source4/ntvfs/ipc/rap_server.c
source4/param/share.c
source4/param/share.h
source4/param/share_classic.c
source4/param/share_ldb.c [deleted file]
source4/param/tests/share.c
source4/param/wscript_build
source4/rpc_server/srvsvc/dcesrv_srvsvc.c
source4/rpc_server/srvsvc/srvsvc_ntvfs.c
source4/smb_server/smb_server.c

diff --git a/docs-xml/smbdotconf/base/sharebackend.xml b/docs-xml/smbdotconf/base/sharebackend.xml
deleted file mode 100644 (file)
index 4da8b17..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<samba:parameter name="share backend"
-                 context="G"
-                 type="string"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-       <para>
-       This option specifies the backend that will be used to access the configuration of
-       file shares.
-       </para>
-
-       <para>Traditionally, Samba file shares have been configured in the
-               <option>smb.conf</option> file and this is still the default.
-       </para>
-
-       <para>At the moment there are no other supported backends.</para>
-</description>
-<value type="default">classic</value>
-</samba:parameter>
index 6f0eeb7edf6bc985e39fe350598f6b4fa31fe53b..6a4ae5557590648aa13ac488c279dde1b03c5a6e 100644 (file)
@@ -2552,8 +2552,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter(lp_ctx, "debug uid", "No");
        lpcfg_do_global_parameter(lp_ctx, "debug class", "No");
 
-       lpcfg_do_global_parameter(lp_ctx, "share backend", "classic");
-
        lpcfg_do_global_parameter(lp_ctx, "server role", "auto");
        lpcfg_do_global_parameter(lp_ctx, "domain logons", "No");
        lpcfg_do_global_parameter(lp_ctx, "domain master", "Auto");
index acb4d149f0b4c19a80f791e057c452932bfa2f59..e13571c3e4f2aa41559633f402602ce94f61d071 100644 (file)
@@ -891,8 +891,6 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
                         &Globals.tls_priority,
                         "NORMAL:-VERS-SSL3.0");
 
-       lpcfg_string_set(Globals.ctx, &Globals.share_backend, "classic");
-
        Globals._preferred_master = Auto;
 
        Globals.allow_dns_updates = DNS_UPDATE_SIGNED;
index fc2d3aa611d288d6124f345d19b09111932bfc90..aa7c0f88891a080a74ded762144e09469864415e 100644 (file)
@@ -48,7 +48,7 @@ NTSTATUS rap_netshareenum(TALLOC_CTX *mem_ctx,
        r->out.available = 0;
        r->out.info = NULL;
 
-       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(lp_ctx), event_ctx, lp_ctx, &sctx);
+       nterr = share_get_context(mem_ctx, lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return nterr;
        }
index 7a57151081269ffe4dba1fa9f419a03ba728d845..aa477c7e82c2ae1fad629467c55a8ca0c68cd192 100644 (file)
@@ -126,20 +126,19 @@ NTSTATUS share_register(const struct share_ops *ops)
        return NT_STATUS_OK;
 }
 
-NTSTATUS share_get_context_by_name(TALLOC_CTX *mem_ctx, const char *backend_name,
-                                  struct tevent_context *event_ctx, 
-                                  struct loadparm_context *lp_ctx,
-                                  struct share_context **ctx)
+NTSTATUS share_get_context(TALLOC_CTX *mem_ctx,
+                          struct loadparm_context *lp_ctx,
+                          struct share_context **ctx)
 {
        const struct share_ops *ops;
 
-       ops = share_backend_by_name(backend_name);
+       ops = share_backend_by_name("classic");
        if (!ops) {
-               DEBUG(0, ("share_init_connection: share backend [%s] not found!\n", backend_name));
+               DEBUG(0, ("share_init_connection: share backend [classic] not found!\n"));
                return NT_STATUS_INTERNAL_ERROR;
        }
 
-       return ops->init(mem_ctx, ops, event_ctx, lp_ctx, ctx);
+       return ops->init(mem_ctx, ops, lp_ctx, ctx);
 }
 
 /*
index f9a749af523a6bb876d686e13d39fb172ade03d7..087697aa9f4dd9cefe2de9b0d123f122543731e2 100644 (file)
@@ -51,7 +51,7 @@ struct tevent_context;
 
 struct share_ops {
        const char *name;
-       NTSTATUS (*init)(TALLOC_CTX *, const struct share_ops*, struct tevent_context *ev_ctx,
+       NTSTATUS (*init)(TALLOC_CTX *, const struct share_ops*,
                         struct loadparm_context *lp_ctx,
                         struct share_context **);
        char *(*string_option)(TALLOC_CTX *, struct share_config *, const char *, const char *);
@@ -77,10 +77,9 @@ NTSTATUS share_create(struct share_context *sctx, const char *name, struct share
 NTSTATUS share_set(struct share_context *sctx, const char *name, struct share_info *info, int count);
 NTSTATUS share_remove(struct share_context *sctx, const char *name);
 NTSTATUS share_register(const struct share_ops *ops);
-NTSTATUS share_get_context_by_name(TALLOC_CTX *mem_ctx, const char *backend_name,
-                                  struct tevent_context *event_ctx, 
-                                  struct loadparm_context *lp_ctx,
-                                  struct share_context **ctx);
+NTSTATUS share_get_context(TALLOC_CTX *mem_ctx,
+                          struct loadparm_context *lp_ctx,
+                          struct share_context **ctx);
 NTSTATUS share_init(void);
 
 /* list of shares options */
index 653723e3b0a7f889882180efbf974c46539ffc88..d03558d1aa5da5a837dd53a9671e75a859898f96 100644 (file)
@@ -27,7 +27,6 @@ NTSTATUS share_classic_init(TALLOC_CTX *);
 
 static NTSTATUS sclassic_init(TALLOC_CTX *mem_ctx, 
                              const struct share_ops *ops, 
-                             struct tevent_context *event_ctx,
                              struct loadparm_context *lp_ctx,
                              struct share_context **ctx)
 {
diff --git a/source4/param/share_ldb.c b/source4/param/share_ldb.c
deleted file mode 100644 (file)
index 30d7f20..0000000
+++ /dev/null
@@ -1,606 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   
-   LDB based shares configuration
-   
-   Copyright (C) Simo Sorce    2006
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include <ldb.h>
-#include <ldb_errors.h>
-#include "auth/auth.h"
-#include "ldb_wrap.h"
-#include "param/share.h"
-#include "param/param.h"
-
-#undef strcasecmp
-
-NTSTATUS share_ldb_init(TALLOC_CTX *);
-
-static NTSTATUS sldb_init(TALLOC_CTX *mem_ctx, const struct share_ops *ops, 
-                         struct tevent_context *ev_ctx,
-                         struct loadparm_context *lp_ctx,
-                         struct share_context **ctx)
-{
-       struct ldb_context *sdb;
-
-       *ctx = talloc(mem_ctx, struct share_context);
-       if (!*ctx) {
-               DEBUG(0, ("ERROR: Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-       
-       sdb = ldb_wrap_connect(*ctx, ev_ctx, lp_ctx,
-                              lpcfg_private_path(*ctx, lp_ctx, "share.ldb"),
-                              system_session(lp_ctx),
-                              NULL, 0);
-
-       if (!sdb) {
-               talloc_free(*ctx);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       (*ctx)->ops = ops;
-       (*ctx)->priv_data = (void *)sdb;
-
-       return NT_STATUS_OK;
-}
-
-static char *sldb_string_option(TALLOC_CTX *mem_ctx, struct share_config *scfg, const char *opt_name, const char *defval)
-{
-       struct ldb_message *msg;
-       struct ldb_message_element *el;
-       const char *colon;
-
-       if (scfg == NULL) return talloc_strdup(mem_ctx, defval);
-
-       msg = talloc_get_type(scfg->opaque, struct ldb_message);
-
-       colon = strchr(opt_name, ':');
-       if (colon != NULL) {
-               char *name;
-
-               name = talloc_strdup(scfg, opt_name);
-               if (!name) {
-                       return NULL;
-               }
-               name[colon-opt_name] = '-';
-
-               el = ldb_msg_find_element(msg, name);
-               TALLOC_FREE(name);
-       } else {
-               el = ldb_msg_find_element(msg, opt_name);
-       }
-
-       if (el == NULL) {
-               return talloc_strdup(mem_ctx, defval);
-       }
-
-       return (char *)(el->values[0].data);
-}
-
-static int sldb_int_option(struct share_config *scfg, const char *opt_name, int defval)
-{
-       char *val;
-       int ret;
-
-       val = sldb_string_option(scfg, scfg, opt_name, NULL);
-       if (val == NULL) return defval;
-
-       errno = 0;
-       ret = (int)strtol(val, NULL, 10);
-       TALLOC_FREE(val);
-
-       if (errno) return -1;
-
-       return ret;
-}
-
-static bool sldb_bool_option(struct share_config *scfg, const char *opt_name, bool defval)
-{
-       char *val;
-
-       val = sldb_string_option(scfg, scfg, opt_name, NULL);
-       if (val == NULL) return defval;
-
-       if (strcasecmp(val, "true") == 0) {
-               TALLOC_FREE(val);
-               return true;
-       }
-
-       TALLOC_FREE(val);
-       return false;
-}
-
-static const char **sldb_string_list_option(TALLOC_CTX *mem_ctx, struct share_config *scfg, const char *opt_name)
-{
-       struct ldb_message *msg;
-       struct ldb_message_element *el;
-       const char **list;
-       const char *colon;
-       int i;
-
-       if (scfg == NULL) return NULL;
-
-       msg = talloc_get_type(scfg->opaque, struct ldb_message);
-
-       colon = strchr(opt_name, ':');
-       if (colon != NULL) {
-               char *name;
-
-               name = talloc_strdup(scfg, opt_name);
-               if (!name) {
-                       return NULL;
-               }
-               name[colon-opt_name] = '-';
-
-               el = ldb_msg_find_element(msg, name);
-               TALLOC_FREE(name);
-       } else {
-               el = ldb_msg_find_element(msg, opt_name);
-       }
-
-       if (el == NULL) {
-               return NULL;
-       }
-
-       list = talloc_array(mem_ctx, const char *, el->num_values + 1);
-       if (!list) return NULL;
-
-       for (i = 0; i < el->num_values; i++) {
-               list[i] = (const char *)(el->values[i].data);
-       }
-       list[i] = NULL;
-
-       return list;
-}
-
-static NTSTATUS sldb_list_all(TALLOC_CTX *mem_ctx,
-                                struct share_context *ctx,
-                                int *count,
-                                const char ***names)
-{
-       int ret, i, j;
-       const char **n;
-       struct ldb_context *ldb;
-       struct ldb_result *res;
-       TALLOC_CTX *tmp_ctx;
-
-       tmp_ctx = talloc_new(mem_ctx);
-       if (!tmp_ctx) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ldb = talloc_get_type(ctx->priv_data, struct ldb_context);
-
-       ret = ldb_search(ldb, tmp_ctx, &res, ldb_dn_new(tmp_ctx, ldb, "CN=SHARES"),
-                        LDB_SCOPE_SUBTREE, NULL, "(name=*)");
-       if (ret != LDB_SUCCESS) {
-               talloc_free(tmp_ctx);
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
-       }
-
-       n = talloc_array(mem_ctx, const char *, res->count);
-       if (!n) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               talloc_free(tmp_ctx);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       for (i = 0, j = 0; i < res->count; i++) {
-               n[j] = talloc_strdup(n, ldb_msg_find_attr_as_string(res->msgs[i], "name", NULL));
-               if (!n[j]) {
-                       DEBUG(0,("WARNING: Malformed share object in share database\n!"));
-                       continue;
-               }
-               j++;
-       }
-
-       *names = n;
-       *count = j;
-       talloc_free(tmp_ctx);
-
-       return NT_STATUS_OK;
-}
-
-static NTSTATUS sldb_get_config(TALLOC_CTX *mem_ctx,
-                        struct share_context *ctx,
-                        const char *name,
-                        struct share_config **scfg)
-{
-       int ret;
-       struct share_config *s;
-       struct ldb_context *ldb;
-       struct ldb_result *res;
-       TALLOC_CTX *tmp_ctx;
-
-       tmp_ctx = talloc_new(mem_ctx);
-       if (!tmp_ctx) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ldb = talloc_get_type(ctx->priv_data, struct ldb_context);
-
-       ret = ldb_search(ldb, tmp_ctx, &res,
-                                ldb_dn_new(tmp_ctx, ldb, "CN=SHARES"), LDB_SCOPE_SUBTREE, NULL,
-                                "(name=%s)", name);
-       if (ret != LDB_SUCCESS || res->count > 1) {
-               talloc_free(tmp_ctx);
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
-       } else if (res->count != 1) {
-               talloc_free(tmp_ctx);
-               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
-       }
-
-       s = talloc(tmp_ctx, struct share_config);
-       if (!s) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               talloc_free(tmp_ctx);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       s->name = talloc_strdup(s, ldb_msg_find_attr_as_string(res->msgs[0], "name", NULL));
-       if (!s->name) {
-               DEBUG(0,("ERROR: Invalid share object!\n"));
-               talloc_free(tmp_ctx);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       s->opaque = talloc_steal(s, res->msgs[0]);
-       if (!s->opaque) {
-               DEBUG(0,("ERROR: Invalid share object!\n"));
-               talloc_free(tmp_ctx);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       s->ctx = ctx;
-
-       *scfg = talloc_steal(mem_ctx, s);
-
-       talloc_free(tmp_ctx);
-       return NT_STATUS_OK;
-}
-
-#define SHARE_ADD_STRING(name, value) do { \
-       err = ldb_msg_add_string(msg, name, value); \
-       if (err != LDB_SUCCESS) { \
-               DEBUG(2,("ERROR: unable to add string share option %s to ldb msg\n", name)); \
-               ret = NT_STATUS_UNSUCCESSFUL; \
-               goto done; \
-       } } while(0)
-
-#define SHARE_ADD_INT(name, value) do { \
-       err = ldb_msg_add_fmt(msg, name, "%d", value); \
-       if (err != LDB_SUCCESS) { \
-               DEBUG(2,("ERROR: unable to add integer share option %s to ldb msg\n", name)); \
-               ret = NT_STATUS_UNSUCCESSFUL; \
-               goto done; \
-       } } while(0)
-
-#define SHARE_ADD_BLOB(name, value) do { \
-       err = ldb_msg_add_value(msg, name, value, NULL); \
-       if (err != LDB_SUCCESS) { \
-               DEBUG(2,("ERROR: unable to add blob share option %s to ldb msg\n", name)); \
-               ret = NT_STATUS_UNSUCCESSFUL; \
-               goto done; \
-       } } while(0)
-
-static NTSTATUS sldb_create(struct share_context *ctx, const char *name, struct share_info *info, int count)
-{
-       struct ldb_context *ldb;
-       struct ldb_message *msg;
-       TALLOC_CTX *tmp_ctx;
-       NTSTATUS ret;
-       int err, i, j;
-
-       for (i = 0, j = 0; i < count && j != 0x03; i++) {
-               if (strcasecmp(info[i].name, SHARE_TYPE) == 0) j |= 0x02;
-               if (strcasecmp(info[i].name, SHARE_PATH) == 0) j |= 0x01;
-               if (strcasecmp(info[i].name, SHARE_NAME) == 0) {
-                       if (strcasecmp(name, (char *)info[i].value) != 0) {
-                               return NT_STATUS_INVALID_PARAMETER;
-                       }
-               }
-       }
-       if (!name || j != 0x03) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-       
-       tmp_ctx = talloc_new(NULL);
-       if (!tmp_ctx) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ldb = talloc_get_type(ctx->priv_data, struct ldb_context);
-
-       msg = ldb_msg_new(tmp_ctx);
-       if (!msg) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       /* TODO: escape info->name */
-       msg->dn = ldb_dn_new_fmt(tmp_ctx, ldb, "CN=%s,CN=SHARES", name);
-       if (!msg->dn) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       SHARE_ADD_STRING("objectClass", "top");
-       SHARE_ADD_STRING("objectClass", "share");
-       SHARE_ADD_STRING("cn", name);
-       SHARE_ADD_STRING(SHARE_NAME, name);
-
-       for (i = 0; i < count; i++) {
-               if (strcasecmp(info[i].name, SHARE_NAME) == 0) continue;
-
-               switch (info[i].type) {
-               case SHARE_INFO_STRING:
-                       SHARE_ADD_STRING(info[i].name, (char *)info[i].value);
-                       break;
-               case SHARE_INFO_INT:
-                       SHARE_ADD_INT(info[i].name, *((int *)info[i].value));
-                       break;
-               case SHARE_INFO_BLOB:
-                       SHARE_ADD_BLOB(info[i].name, (DATA_BLOB *)info[i].value);
-                       break;
-               default:
-                       DEBUG(2,("ERROR: Invalid share info type for %s\n", info[i].name));
-                       ret = NT_STATUS_INVALID_PARAMETER;
-                       goto done;
-               }
-       }
-
-       /* TODO: Security Descriptor */
-
-       SHARE_ADD_STRING(SHARE_AVAILABLE, "true");
-       SHARE_ADD_STRING(SHARE_BROWSEABLE, "true");
-       SHARE_ADD_STRING(SHARE_READONLY, "false");
-       SHARE_ADD_STRING(SHARE_NTVFS_HANDLER, "unixuid");
-       SHARE_ADD_STRING(SHARE_NTVFS_HANDLER, "posix");
-
-       err = ldb_add(ldb, msg);
-       if (err != LDB_SUCCESS) {
-               DEBUG(2,("ERROR: unable to add share %s to share.ldb\n"
-                        "       err=%d [%s]\n", name, err, ldb_errstring(ldb)));
-               if (err == LDB_ERR_NO_SUCH_OBJECT) {
-                       ret = NT_STATUS_OBJECT_NAME_NOT_FOUND;
-               } else if (err == LDB_ERR_ENTRY_ALREADY_EXISTS) {
-                       ret = NT_STATUS_OBJECT_NAME_COLLISION;
-               } else {
-                       ret = NT_STATUS_UNSUCCESSFUL;
-               }
-               goto done;
-       }
-
-       ret = NT_STATUS_OK;
-done:
-       talloc_free(tmp_ctx);
-       return ret;
-}
-
-#define SHARE_MOD_STRING(name, value) do { \
-       err = ldb_msg_add_empty(msg, name, LDB_FLAG_MOD_REPLACE, NULL); \
-       if (err != LDB_SUCCESS) { \
-               DEBUG(2,("ERROR: unable to add string share option %s to ldb msg\n", name)); \
-               ret = NT_STATUS_UNSUCCESSFUL; \
-               goto done; \
-       } \
-       err = ldb_msg_add_string(msg, name, value); \
-       if (err != LDB_SUCCESS) { \
-               DEBUG(2,("ERROR: unable to add string share option %s to ldb msg\n", name)); \
-               ret = NT_STATUS_UNSUCCESSFUL; \
-               goto done; \
-       } } while(0)
-
-#define SHARE_MOD_INT(name, value) do { \
-       err = ldb_msg_add_empty(msg, name, LDB_FLAG_MOD_REPLACE, NULL); \
-       if (err != LDB_SUCCESS) { \
-               DEBUG(2,("ERROR: unable to add string share option %s to ldb msg\n", name)); \
-               ret = NT_STATUS_UNSUCCESSFUL; \
-               goto done; \
-       } \
-       err = ldb_msg_add_fmt(msg, name, "%d", value); \
-       if (err != LDB_SUCCESS) { \
-               DEBUG(2,("ERROR: unable to add integer share option %s to ldb msg\n", name)); \
-               ret = NT_STATUS_UNSUCCESSFUL; \
-               goto done; \
-       } } while(0)
-
-#define SHARE_MOD_BLOB(name, value) do { \
-       err = ldb_msg_add_empty(msg, name, LDB_FLAG_MOD_REPLACE, NULL); \
-       if (err != LDB_SUCCESS) { \
-               DEBUG(2,("ERROR: unable to add string share option %s to ldb msg\n", name)); \
-               ret = NT_STATUS_UNSUCCESSFUL; \
-               goto done; \
-       } \
-       err = ldb_msg_add_value(msg, name, value, NULL); \
-       if (err != LDB_SUCCESS) { \
-               DEBUG(2,("ERROR: unable to add blob share option %s to ldb msg\n", name)); \
-               ret = NT_STATUS_UNSUCCESSFUL; \
-               goto done; \
-       } } while(0)
-
-static NTSTATUS sldb_set(struct share_context *ctx, const char *name, struct share_info *info, int count)
-{
-       struct ldb_context *ldb;
-       struct ldb_message *msg;
-       TALLOC_CTX *tmp_ctx;
-       NTSTATUS ret;
-       bool do_rename = false;
-       char *newname = NULL;
-       int err, i;
-
-       if (!name) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-       
-       tmp_ctx = talloc_new(NULL);
-       if (!tmp_ctx) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ldb = talloc_get_type(ctx->priv_data, struct ldb_context);
-
-       msg = ldb_msg_new(tmp_ctx);
-       if (!msg) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       /* TODO: escape name */
-       msg->dn = ldb_dn_new_fmt(tmp_ctx, ldb, "CN=%s,CN=SHARES", name);
-       if (!msg->dn) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       for (i = 0; i < count; i++) {
-               if (strcasecmp(info[i].name, SHARE_NAME) == 0) {
-                       if (strcasecmp(name, (char *)info[i].value) != 0) {
-                               do_rename = true;
-                               newname = (char *)info[i].value;
-                               SHARE_MOD_STRING("cn", (char *)info[i].value);
-                       }
-               }
-
-               switch (info[i].type) {
-               case SHARE_INFO_STRING:
-                       SHARE_MOD_STRING(info[i].name, (char *)info[i].value);
-                       break;
-               case SHARE_INFO_INT:
-                       SHARE_MOD_INT(info[i].name, *((int *)info[i].value));
-                       break;
-               case SHARE_INFO_BLOB:
-                       SHARE_MOD_BLOB(info[i].name, (DATA_BLOB *)info[i].value);
-                       break;
-               default:
-                       DEBUG(2,("ERROR: Invalid share info type for %s\n", info[i].name));
-                       ret = NT_STATUS_INVALID_PARAMETER;
-                       goto done;
-               }
-       }
-
-       if (do_rename) {
-               struct ldb_dn *olddn, *newdn;
-
-               olddn = msg->dn;
-
-               /* TODO: escape newname */
-               newdn = ldb_dn_new_fmt(tmp_ctx, ldb, "CN=%s,CN=SHARES", newname);
-               if (!newdn) {
-                       DEBUG(0,("ERROR: Out of memory!\n"));
-                       ret = NT_STATUS_NO_MEMORY;
-                       goto done;
-               }
-
-               err = ldb_rename(ldb, olddn, newdn);
-               if (err != LDB_SUCCESS) {
-                       DEBUG(2,("ERROR: unable to rename share %s (to %s)\n"
-                                "       err=%d [%s]\n", name, newname, err, ldb_errstring(ldb)));
-                       if (err == LDB_ERR_NO_SUCH_OBJECT) {
-                               ret = NT_STATUS_OBJECT_NAME_COLLISION;
-                       } else {
-                               ret = NT_STATUS_UNSUCCESSFUL;
-                       }
-                       goto done;
-               }
-
-               msg->dn = newdn;
-       }
-
-       err = ldb_modify(ldb, msg);
-       if (err != LDB_SUCCESS) {
-               DEBUG(2,("ERROR: unable to add share %s to share.ldb\n"
-                        "       err=%d [%s]\n", name, err, ldb_errstring(ldb)));
-               if (err == LDB_ERR_NO_SUCH_OBJECT) {
-                       ret = NT_STATUS_OBJECT_NAME_COLLISION;
-               } else {
-                       ret = NT_STATUS_UNSUCCESSFUL;
-               }
-               goto done;
-       }
-
-       ret = NT_STATUS_OK;
-done:
-       talloc_free(tmp_ctx);
-       return ret;
-}
-
-static NTSTATUS sldb_remove(struct share_context *ctx, const char *name)
-{
-       struct ldb_context *ldb;
-       struct ldb_dn *dn;
-       TALLOC_CTX *tmp_ctx;
-       NTSTATUS ret;
-       int err;
-
-       tmp_ctx = talloc_new(NULL);
-       if (!tmp_ctx) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ldb = talloc_get_type(ctx->priv_data, struct ldb_context);
-
-       dn = ldb_dn_new_fmt(tmp_ctx, ldb, "CN=%s,CN=SHARES", name);
-       if (!dn) {
-               DEBUG(0,("ERROR: Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       err = ldb_delete(ldb, dn);
-       if (err != LDB_SUCCESS) {
-               DEBUG(2,("ERROR: unable to remove share %s from share.ldb\n"
-                        "       err=%d [%s]\n", name, err, ldb_errstring(ldb)));
-               ret = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       ret = NT_STATUS_OK;
-done:
-       talloc_free(tmp_ctx);
-       return ret;
-}
-
-static const struct share_ops ops = {
-       .name = "ldb",
-       .init = sldb_init,
-       .string_option = sldb_string_option,
-       .int_option = sldb_int_option,
-       .bool_option = sldb_bool_option,
-       .string_list_option = sldb_string_list_option,
-       .list_all = sldb_list_all,
-       .get_config = sldb_get_config,
-       .create = sldb_create,
-       .set = sldb_set,
-       .remove = sldb_remove
-};
-
-NTSTATUS share_ldb_init(TALLOC_CTX *ctx)
-{
-       return share_register(&ops);
-}
index 6d786a81157ce791b86999e99a5bd6814e094368..9ac43bac9f2b9564efdb856c9b7c41a066823016 100644 (file)
@@ -181,14 +181,9 @@ static void tcase_add_share_tests(struct torture_tcase *tcase)
                        test_double_create, NULL);
 }
 
-static bool setup_ldb(struct torture_context *tctx, void **data)
-{
-       return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "ldb", tctx->ev, tctx->lp_ctx, (struct share_context **)data));
-}
-
 static bool setup_classic(struct torture_context *tctx, void **data)
 {
-       return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "classic", tctx->ev, tctx->lp_ctx, (struct share_context **)data));
+       return NT_STATUS_IS_OK(share_get_context(tctx, tctx->lp_ctx, (struct share_context **)data));
 }
 
 static bool teardown(struct torture_context *tctx, void *data)
@@ -204,10 +199,6 @@ struct torture_suite *torture_local_share(TALLOC_CTX *mem_ctx)
 
        share_init();
 
-       tcase = torture_suite_add_tcase(suite, "ldb");
-       torture_tcase_set_fixture(tcase, setup_ldb, teardown);
-       tcase_add_share_tests(tcase);
-
        tcase = torture_suite_add_tcase(suite, "classic");
        torture_tcase_set_fixture(tcase, setup_classic, teardown);
        tcase_add_share_tests(tcase);
index 5d237184b10b02cbd2dd77fe70ef4ef950a74a04..d1b852c0c73d177b53180c5776c459d85af9865c 100644 (file)
@@ -24,15 +24,7 @@ bld.SAMBA_MODULE('share_classic',
        source='share_classic.c',
        subsystem='share',
        init_function='share_classic_init',
-       deps='samba-util'
-       )
-
-
-bld.SAMBA_MODULE('share_ldb',
-       source='share_ldb.c',
-       subsystem='share',
-       init_function='share_ldb_init',
-       deps='ldbsamba auth_system_session'
+       deps='samba-util samba-hostconfig'
        )
 
 
index c41fbc7573f33e54e7a04adab062e2307a7a72dc..d7a22626b53915a2570d14ceda0df2263b668dfa 100644 (file)
@@ -421,7 +421,7 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
                unsigned int count = 8;
                unsigned int i;
 
-               nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+               nterr = share_get_context(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
                if (!NT_STATUS_IS_OK(nterr)) {
                        return ntstatus_to_werror(nterr);
                }
@@ -519,7 +519,7 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
                unsigned int count = 10;
                unsigned int i;
 
-               nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+               nterr = share_get_context(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
                if (!NT_STATUS_IS_OK(nterr)) {
                        return ntstatus_to_werror(nterr);
                }
@@ -703,7 +703,7 @@ static WERROR dcesrv_srvsvc_NetShareEnumAll(struct dcesrv_call_state *dce_call,
        /* TODO: - paging of results 
         */
 
-       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -954,7 +954,7 @@ static WERROR dcesrv_srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call,
                return WERR_INVALID_PARAMETER;
        }
 
-       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -1208,7 +1208,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
                return WERR_INVALID_PARAMETER;
        }
 
-       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -1386,7 +1386,7 @@ static WERROR dcesrv_srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TA
        }
        all_string_sub(device, "\\", "/", 0);
 
-       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -1796,7 +1796,7 @@ static WERROR dcesrv_srvsvc_NetShareEnum(struct dcesrv_call_state *dce_call, TAL
        /* TODO: - paging of results 
         */
 
-       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
@@ -2265,7 +2265,7 @@ static WERROR dcesrv_srvsvc_NetShareDel(struct dcesrv_call_state *dce_call, TALL
        NTSTATUS nterr;
        struct share_context *sctx;
                
-       nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       nterr = share_get_context(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(nterr)) {
                return ntstatus_to_werror(nterr);
        }
index 2d45e554a145b945bf68435f4c8ee80a9d7eb197..cbd0eb356c124b74b0fe14861a6306a73a3424ad 100644 (file)
@@ -55,7 +55,7 @@ NTSTATUS srvsvc_create_ntvfs_context(struct dcesrv_call_state *dce_call,
        const struct tsocket_address *local_address;
        const struct tsocket_address *remote_address;
 
-       status = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
+       status = share_get_context(mem_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
index 57810c08a9674c3935d38610656937d705a3867a..c45df702c3f08d5e39d6d3bfe57e4e6ba2e4a6cd 100644 (file)
@@ -156,9 +156,9 @@ static void smbsrv_accept(struct stream_connection *conn)
 
        irpc_add_name(conn->msg_ctx, "smb_server");
 
-       if (!NT_STATUS_IS_OK(share_get_context_by_name(smb_conn, lpcfg_share_backend(smb_conn->lp_ctx),
-                                                      smb_conn->connection->event.ctx,
-                                                      smb_conn->lp_ctx, &(smb_conn->share_context)))) {
+       if (!NT_STATUS_IS_OK(share_get_context(smb_conn,
+                                              smb_conn->lp_ctx,
+                                              &(smb_conn->share_context)))) {
                smbsrv_terminate_connection(smb_conn, "share_init failed!");
                return;
        }