From 82da2d401e54d0b3124b727fab755d94dd5402d4 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 8 Mar 2006 01:01:14 +0000
Subject: r13998: From now on ldb_request() will require an alloced request By
 freeing the request you will be sure everything down the path get freed.

this also means you have to steal the results if you want to keep them :)

simo.
(This used to be commit e8075e6a062ce5edb84485e45d0b841c2ee2af7d)
---
 source4/dsdb/samdb/ldb_modules/extended_dn.c | 19 ++++++++++-----
 source4/dsdb/samdb/ldb_modules/proxy.c       | 36 +++++++++++++++-------------
 2 files changed, 33 insertions(+), 22 deletions(-)

(limited to 'source4/dsdb/samdb/ldb_modules')

diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c b/source4/dsdb/samdb/ldb_modules/extended_dn.c
index 25a8dd1d36..20d08ccf42 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c
@@ -271,19 +271,26 @@ static int extended_request(struct ldb_module *module, struct ldb_request *req)
 
 static int extended_init(struct ldb_module *module)
 {
-	struct ldb_request request;
+	struct ldb_request *req;
 	int ret;
 
-	request.operation = LDB_REQ_REGISTER;
-	request.op.reg.oid = LDB_CONTROL_EXTENDED_DN_OID;
-	request.controls = NULL;
+	req = talloc(module, struct ldb_request);
+	if (req == NULL) {
+		return LDB_ERR_OPERATIONS_ERROR;
+	}
 
-	ret = ldb_request(module->ldb, &request);
+	req->operation = LDB_REQ_REGISTER;
+	req->op.reg.oid = LDB_CONTROL_EXTENDED_DN_OID;
+	req->controls = NULL;
+
+	ret = ldb_request(module->ldb, req);
 	if (ret != LDB_SUCCESS) {
 		ldb_debug(module->ldb, LDB_DEBUG_ERROR, "extended_dn: Unable to register control with rootdse!\n");
-		return LDB_ERR_OTHER;
+		talloc_free(req);
+		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
+	talloc_free(req);
 	return ldb_next_init(module);
 }
 
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c
index 85b40b62d1..9f9a8c229e 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -249,7 +249,7 @@ static void proxy_convert_record(struct ldb_module *module, struct ldb_message *
 static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *req)
 {
 	struct proxy_data *proxy = talloc_get_type(module->private_data, struct proxy_data);
-	struct ldb_request newreq;
+	struct ldb_request *newreq;
 	struct ldb_dn *base;
 	int ret, i;
 
@@ -268,43 +268,47 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re
 		goto passthru;
 	}
 
-	newreq.op.search.tree = proxy_convert_tree(module, req->op.search.tree);
+	newreq = talloc(module, struct ldb_request);
+	if (newreq == NULL) {
+		return -1;
+	}
+
+	newreq->op.search.tree = proxy_convert_tree(module, req->op.search.tree);
 
 	/* convert the basedn of this search */
 	base = ldb_dn_copy(proxy, req->op.search.base);
 	if (base == NULL) {
+		talloc_free(newreq);
 		goto failed;
 	}
 	base->comp_num -= proxy->newdn->comp_num;
-	base = ldb_dn_compose(proxy, newreq.op.search.base, proxy->olddn);
+	base = ldb_dn_compose(proxy, newreq->op.search.base, proxy->olddn);
 
 	ldb_debug(module->ldb, LDB_DEBUG_FATAL, "proxying: '%s' with dn '%s' \n", 
-		  ldb_filter_from_tree(proxy, newreq.op.search.tree), ldb_dn_linearize(proxy, newreq.op.search.base));
+		  ldb_filter_from_tree(proxy, newreq->op.search.tree), ldb_dn_linearize(proxy, newreq->op.search.base));
 	for (i = 0; req->op.search.attrs && req->op.search.attrs[i]; i++) {
 		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "attr: '%s'\n", req->op.search.attrs[i]);
 	}
 
-	newreq.op.search.base = base;
-	newreq.op.search.scope = req->op.search.scope;
-	newreq.op.search.attrs = req->op.search.attrs;
-	newreq.op.search.res = req->op.search.res;
-	newreq.controls = req->controls;
-	ret = ldb_request(proxy->upstream, &newreq);
+	newreq->op.search.base = base;
+	newreq->op.search.scope = req->op.search.scope;
+	newreq->op.search.attrs = req->op.search.attrs;
+	newreq->op.search.res = req->op.search.res;
+	newreq->controls = req->controls;
+	ret = ldb_request(proxy->upstream, newreq);
 	if (ret != LDB_SUCCESS) {
 		ldb_set_errstring(module->ldb, talloc_strdup(module, ldb_errstring(proxy->upstream)));
+		talloc_free(newreq);
 		return -1;
 	}
 
-	for (i = 0; i < newreq.op.search.res->count; i++) {
-		struct ldb_ldif ldif;
+	for (i = 0; i < newreq->op.search.res->count; i++) {
 		printf("# record %d\n", i+1);
 		
-		proxy_convert_record(module, newreq.op.search.res->msgs[i]);
-
-		ldif.changetype = LDB_CHANGETYPE_NONE;
-		ldif.msg = newreq.op.search.res->msgs[i];
+		proxy_convert_record(module, newreq->op.search.res->msgs[i]);
 	}
 
+	talloc_free(newreq);
 	return ret;
 
 failed:
-- 
cgit