s4-ldb Add LDB_REQ_SET_LOCATION to help track handler use

This greatly assists in debugging what is going on with the
ldb handle, as it indicates where it was created.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Oct 18 11:54:46 UTC 2010 on sn-devel-104

4 files changed, 14 insertions, 0 deletions

diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c
index 483222ec20..61d0d4cdf3 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/source4/lib/ldb/ldb_map/ldb_map.c
@@ -891,6 +891,7 @@ struct ldb_request *map_search_base_req(struct map_context *ac, struct ldb_dn *d
 					NULL,
 					context, callback,
 					ac->req);
+	LDB_REQ_SET_LOCATION(req);
 	if (ret != LDB_SUCCESS) {
 		return NULL;
 	}
@@ -938,6 +939,7 @@ struct ldb_request *map_build_fixup_req(struct map_context *ac,
 				ac, msg, NULL,
 				context, callback,
 				ac->req);
+	LDB_REQ_SET_LOCATION(req);
 	if (ret != LDB_SUCCESS) {
 		goto failed;
 	}
diff --git a/source4/lib/ldb/ldb_map/ldb_map_inbound.c b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
index cdc88afbc5..83eec1d555 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_inbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_inbound.c
@@ -414,6 +414,7 @@ int map_add(struct ldb_module *module, struct ldb_request *req)
 				req->controls,
 				ac, map_op_remote_callback,
 				req);
+	LDB_REQ_SET_LOCATION(ac->remote_req);
 	if (ret != LDB_SUCCESS) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
@@ -451,6 +452,7 @@ static int map_add_do_local(struct map_context *ac)
 				ac,
 				map_op_local_callback,
 				ac->req);
+	LDB_REQ_SET_LOCATION(local_req);
 	if (ret != LDB_SUCCESS) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
@@ -522,6 +524,7 @@ int map_modify(struct ldb_module *module, struct ldb_request *req)
 				req->controls,
 				ac, map_op_remote_callback,
 				req);
+	LDB_REQ_SET_LOCATION(ac->remote_req);
 	if (ret != LDB_SUCCESS) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
@@ -571,6 +574,7 @@ static int map_modify_do_local(struct map_context *ac)
 					ac,
 					map_op_local_callback,
 					ac->req);
+		LDB_REQ_SET_LOCATION(local_req);
 		if (ret != LDB_SUCCESS) {
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
@@ -582,6 +586,7 @@ static int map_modify_do_local(struct map_context *ac)
 					ac,
 					map_op_local_callback,
 					ac->req);
+		LDB_REQ_SET_LOCATION(local_req);
 		if (ret != LDB_SUCCESS) {
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
@@ -628,6 +633,7 @@ int map_delete(struct ldb_module *module, struct ldb_request *req)
 				   ac,
 				   map_op_remote_callback,
 				   req);
+	LDB_REQ_SET_LOCATION(ac->remote_req);
 	if (ret != LDB_SUCCESS) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
@@ -670,6 +676,7 @@ static int map_delete_do_local(struct map_context *ac)
 				   ac,
 				   map_op_local_callback,
 				   ac->req);
+	LDB_REQ_SET_LOCATION(local_req);
 	if (ret != LDB_SUCCESS) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
@@ -721,6 +728,7 @@ int map_rename(struct ldb_module *module, struct ldb_request *req)
 				   req->controls,
 				   ac, map_op_remote_callback,
 				   req);
+	LDB_REQ_SET_LOCATION(ac->remote_req);
 	if (ret != LDB_SUCCESS) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
@@ -764,6 +772,7 @@ static int map_rename_do_local(struct map_context *ac)
 				   ac,
 				   map_rename_local_callback,
 				   ac->req);
+	LDB_REQ_SET_LOCATION(local_req);
 	if (ret != LDB_SUCCESS) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
index 40be94c894..ebed0d2bf9 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
@@ -1208,6 +1208,7 @@ int map_search(struct ldb_module *module, struct ldb_request *req)
 				      req->controls,
 				      ac, map_remote_search_callback,
 				      req);
+	LDB_REQ_SET_LOCATION(remote_req);
 	if (ret != LDB_SUCCESS) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c
index 39780cb699..bd2ea0942e 100644
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -270,6 +270,7 @@ static int ps_search(struct ldb_module *module, struct ldb_request *req)
 					ac,
 					ps_callback,
 					ac->req);
+	LDB_REQ_SET_LOCATION(ac->down_req);
 	if (ret != LDB_SUCCESS) {
 		return ret;
 	}
@@ -351,6 +352,7 @@ static int ps_init(struct ldb_module *module)
 				   attrs, NULL,
 				   data, check_supported_paged,
 				   NULL);
+	LDB_REQ_SET_LOCATION(req);
 	if (ret != LDB_SUCCESS) {
 		return ret;
 	}