From 22f4030c303224ecc7ee28b0b93d80d27869a4a0 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Tue, 1 Feb 2011 20:48:52 +0100 Subject: ldb:ldbsearch tool - use LDB result constants where possible --- source4/lib/ldb/tools/ldbsearch.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c index f68a4bf31d..10fab25a6a 100644 --- a/source4/lib/ldb/tools/ldbsearch.c +++ b/source4/lib/ldb/tools/ldbsearch.c @@ -194,14 +194,14 @@ static int do_search(struct ldb_context *ldb, req = NULL; sctx = talloc_zero(ldb, struct search_context); - if (!sctx) return -1; + if (!sctx) return LDB_ERR_OPERATIONS_ERROR; sctx->ldb = ldb; sctx->sort = options->sorted; sctx->req_ctrls = ldb_parse_control_strings(ldb, sctx, (const char **)options->controls); if (options->controls != NULL && sctx->req_ctrls== NULL) { printf("parsing controls failed: %s\n", ldb_errstring(ldb)); - return -1; + return LDB_ERR_OPERATIONS_ERROR; } if (basedn == NULL) { @@ -221,7 +221,7 @@ again: if (ret != LDB_SUCCESS) { talloc_free(sctx); printf("allocating request failed: %s\n", ldb_errstring(ldb)); - return -1; + return ret; } sctx->pending = 0; @@ -229,13 +229,13 @@ again: ret = ldb_request(ldb, req); if (ret != LDB_SUCCESS) { printf("search failed - %s\n", ldb_errstring(ldb)); - return -1; + return ret; } ret = ldb_wait(req->handle, LDB_WAIT_ALL); - if (ret != LDB_SUCCESS) { + if (ret != LDB_SUCCESS) { printf("search error - %s\n", ldb_errstring(ldb)); - return -1; + return ret; } if (sctx->pending) @@ -262,7 +262,7 @@ again: talloc_free(sctx); talloc_free(req); - return 0; + return LDB_SUCCESS; } int main(int argc, const char **argv) -- cgit