sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-13 08:23:49 +03:00
Code Activity

r13998: From now on ldb_request() will require an alloced request

Browse Source 
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 commit is contained in:
Simo Sorce
2006-03-08 01:01:14 +00:00
committed by Gerald (Jerry) Carter
parent ef1b3e6368
commit e8075e6a06
7 changed files with 189 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/lib/ldb/tools/ldbsearch.c
View File

@@ -68,33 +68,34 @@ static int do_search(struct ldb_context *ldb,
int loop = 0;
int total = 0;
int refs = 0;
struct ldb_request req;
struct ldb_request *req;
struct ldb_result *result = NULL;
req.operation = LDB_REQ_SEARCH;
req.op.search.base = basedn;
req.op.search.scope = options->scope;
req.op.search.tree = ldb_parse_tree(ldb, expression);
if (req.op.search.tree == NULL) return -1;
req.op.search.attrs = attrs;
req.op.search.res = NULL;
req.controls = parse_controls(ldb, options->controls);
if (options->controls != NULL && req.controls == NULL) return -1;
req.creds = NULL;
req = talloc(ldb, struct ldb_request);
req->operation = LDB_REQ_SEARCH;
req->op.search.base = basedn;
req->op.search.scope = options->scope;
req->op.search.tree = ldb_parse_tree(ldb, expression);
if (req->op.search.tree == NULL) return -1;
req->op.search.attrs = attrs;
req->op.search.res = NULL;
req->controls = parse_controls(ldb, options->controls);
if (options->controls != NULL && req->controls == NULL) return -1;
req->creds = NULL;
do {
loop = 0;
ret = ldb_request(ldb, &req);
ret = ldb_request(ldb, req);
if (ret != LDB_SUCCESS) {
printf("search failed - %s\n", ldb_errstring(ldb));
if (req.op.search.res && req.op.search.res->controls) {
handle_controls_reply(req.op.search.res->controls, req.controls);
if (req->op.search.res && req->op.search.res->controls) {
handle_controls_reply(req->op.search.res->controls, req->controls);
}
return -1;
}
result = req.op.search.res;
result = req->op.search.res;
if (options->sorted) {
ldb_qsort(result->msgs, result->count, sizeof(struct ldb_message *),
@@ -127,7 +128,7 @@ static int do_search(struct ldb_context *ldb,
}
if (result->controls) {
if (handle_controls_reply(result->controls, req.controls) == 1)
if (handle_controls_reply(result->controls, req->controls) == 1)
loop = 1;
}
@@ -139,7 +140,7 @@ static int do_search(struct ldb_context *ldb,
}
}
req.op.search.res = NULL;
req->op.search.res = NULL;
} while(loop);