r22557: Simo has long bugged me that the paths in the sam.ldb partitions were

not relative to the location of the sam.ldb, but instead
lp_private_dir().

This fixes that issue.

Andrew Bartlett

1 files changed, 11 insertions, 1 deletions

diff --git a/source/lib/ldb/common/ldb.c b/source/lib/ldb/common/ldb.c
index c317fe57faf..26213facf2a 100644
--- a/source/lib/ldb/common/ldb.c
+++ b/source/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;