summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/partition.c31
-rw-r--r--source4/lib/ldb/common/ldb.c12
2 files changed, 41 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 614431c563..b301a98534 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -703,6 +703,33 @@ static int sort_compare(void *void1,
return ldb_dn_compare(partition1->dn, partition2->dn);
}
+static const char *relative_path(struct ldb_module *module,
+ TALLOC_CTX *mem_ctx,
+ const char *name)
+{
+ const char *base_url = ldb_get_opaque(module->ldb, "ldb_url");
+ char *path, *p, *full_name;
+ if (name == NULL) {
+ return NULL;
+ }
+ if (name[0] == 0 || name[0] == '/' || strstr(name, ":/")) {
+ return talloc_strdup(mem_ctx, name);
+ }
+ path = talloc_strdup(mem_ctx, base_url);
+ if (path == NULL) {
+ return NULL;
+ }
+ if ( (p = strrchr(path, '/')) != NULL) {
+ p[0] = '\0';
+ } else {
+ talloc_free(path);
+ return NULL;
+ }
+ full_name = talloc_asprintf(mem_ctx, "%s/%s", path, name);
+ talloc_free(path);
+ return full_name;
+}
+
static int partition_init(struct ldb_module *module)
{
int ret, i;
@@ -791,7 +818,9 @@ static int partition_init(struct ldb_module *module)
return LDB_ERR_CONSTRAINT_VIOLATION;
}
- data->partitions[i]->backend = private_path(data->partitions[i], p);
+ data->partitions[i]->backend = relative_path(module,
+ data->partitions[i],
+ p);
ret = ldb_connect_backend(module->ldb, data->partitions[i]->backend, NULL, &data->partitions[i]->module);
if (ret != LDB_SUCCESS) {
talloc_free(mem_ctx);
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index c317fe57fa..26213facf2 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -231,12 +231,22 @@ struct ldb_dn *ldb_get_default_basedn(struct ldb_context *ldb)
int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[])
{
int ret;
-
+ const char *url2;
/* We seem to need to do this here, or else some utilities don't get ldb backends */
ldb_global_init();
ldb->flags = flags;
+ url2 = talloc_strdup(ldb, url);
+ if (!url2) {
+ ldb_oom(ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+ ret = ldb_set_opaque(ldb, "ldb_url", talloc_strdup(ldb, url2));
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+
ret = ldb_connect_backend(ldb, url, options, &ldb->modules);
if (ret != LDB_SUCCESS) {
return ret;