r10810: This adds the hooks required to communicate the current user from the

authenticated session down into LDB.  This associates a session info
structure with the open LDB, allowing a future ldb_ntacl module to
allow/deny operations on that basis.

Along the way, I cleaned up a few things, and added new helper functions
to assist.  In particular the LSA pipe uses simpler queries for some of
the setup.

In ldap_server, I have removed the 'ldasrv:hacked' module, which hasn't
been worked on (other than making it continue to compile) since January,
and I think the features of this module are being put into ldb anyway.

I have also changed the partitions in ldap_server to be initialised
after the connection, with the private pointer used to associate the ldb
with the incoming session.

Andrew Bartlett
(This used to be commit fd7203789a2c0929eecea8125b57b833a67fed71)

1 files changed, 10 insertions, 7 deletions

diff --git a/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c
index 2392f23799..75429b1843 100644
--- a/source4/ldap_server/ldap_rootdse.c
+++ b/source4/ldap_server/ldap_rootdse.c
@@ -52,25 +52,28 @@ static void rootdse_db_debug(void *context, enum ldb_debug_level level, const ch
 /*
   connect to the SAM database
  */
-static struct ldb_context *rootdse_db_connect(TALLOC_CTX *mem_ctx)
+NTSTATUS rootdse_Init(struct ldapsrv_partition *partition, struct ldapsrv_connection *conn)
 {
 	char *db_path;
 	struct ldb_context *ldb;
+	TALLOC_CTX *mem_ctx = talloc_new(partition);
 
 	db_path = talloc_asprintf(mem_ctx, "tdb://%s", 
 				  private_path(mem_ctx, "rootdse.ldb"));
 	if (db_path == NULL) {
-		return NULL;
+		return NT_STATUS_NO_MEMORY;
 	}
 
 	ldb = ldb_wrap_connect(mem_ctx, db_path, 0, NULL);
 	if (ldb == NULL) {
-		return NULL;
+		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 
 	ldb_set_debug(ldb, rootdse_db_debug, NULL);
 
-	return ldb;
+	talloc_steal(partition, ldb);
+	partition->private = ldb;
+	return NT_STATUS_OK;
 }
 
 
@@ -258,7 +261,7 @@ static NTSTATUS fill_dynamic_values(void *mem_ctx, struct ldb_message_element *a
 }
 
 static NTSTATUS rootdse_Search(struct ldapsrv_partition *partition, struct ldapsrv_call *call,
-				     struct ldap_SearchRequest *r)
+			       struct ldap_SearchRequest *r)
 {
 	NTSTATUS status;
 	void *local_ctx;
@@ -279,8 +282,7 @@ static NTSTATUS rootdse_Search(struct ldapsrv_partition *partition, struct ldaps
 	local_ctx = talloc_named(call, 0, "rootdse_Search local memory context");
 	NT_STATUS_HAVE_NO_MEMORY(local_ctx);
 
-	ldb = rootdse_db_connect(local_ctx);
-	NT_STATUS_HAVE_NO_MEMORY(ldb);
+	ldb = partition->private;
 
 	if (r->num_attributes >= 1) {
 		attrs = talloc_array(ldb, const char *, r->num_attributes+1);
@@ -359,6 +361,7 @@ queue_reply:
 }
 
 static const struct ldapsrv_partition_ops rootdse_ops = {
+	.Init           = rootdse_Init,
 	.Search		= rootdse_Search
 };