From d590dea10b3abf93fcc8138189291e8b66bae7d7 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Wed, 22 Feb 2006 05:21:43 +0000 Subject: r13615: Make ldb_set_errstring get ldb instead of module as parameter. The module was just used to get to the ldb so it was meningless. Also add LDB_WAIT_ONCE e relative code in ldb_ildap.c (This used to be commit d5b467b7c132b0bd4d23918ba7bf3370b1afcce8) --- source4/lib/ldb/common/ldb.c | 18 +++++++++--------- source4/lib/ldb/common/ldb_debug.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/lib/ldb/common') diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 68722cde96..87705a855a 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -106,12 +106,12 @@ int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, co return LDB_SUCCESS; } -void ldb_set_errstring(struct ldb_module *module, char *err_string) +void ldb_set_errstring(struct ldb_context *ldb, char *err_string) { - if (module->ldb->err_string) { - talloc_free(module->ldb->err_string); + if (ldb->err_string) { + talloc_free(ldb->err_string); } - module->ldb->err_string = talloc_steal(module->ldb, err_string); + ldb->err_string = talloc_steal(ldb, err_string); } void ldb_reset_err_string(struct ldb_context *ldb) @@ -158,7 +158,7 @@ int ldb_transaction_start(struct ldb_context *ldb) if (status != LDB_SUCCESS) { if (ldb->err_string == NULL) { /* no error string was setup by the backend */ - ldb_set_errstring(ldb->modules, + ldb_set_errstring(ldb, talloc_asprintf(ldb, "ldb transaction start error %d", status)); } } @@ -186,7 +186,7 @@ int ldb_transaction_commit(struct ldb_context *ldb) if (status != LDB_SUCCESS) { if (ldb->err_string == NULL) { /* no error string was setup by the backend */ - ldb_set_errstring(ldb->modules, + ldb_set_errstring(ldb, talloc_asprintf(ldb, "ldb transaction commit error %d", status)); } } @@ -212,7 +212,7 @@ int ldb_transaction_cancel(struct ldb_context *ldb) if (status != LDB_SUCCESS) { if (ldb->err_string == NULL) { /* no error string was setup by the backend */ - ldb_set_errstring(ldb->modules, + ldb_set_errstring(ldb, talloc_asprintf(ldb, "ldb transaction cancel error %d", status)); } } @@ -238,7 +238,7 @@ static int ldb_op_finish(struct ldb_context *ldb, int status) } if (ldb->err_string == NULL) { /* no error string was setup by the backend */ - ldb_set_errstring(ldb->modules, + ldb_set_errstring(ldb, talloc_asprintf(ldb, "ldb error %d", status)); } ldb_transaction_cancel(ldb); @@ -330,7 +330,7 @@ int ldb_search(struct ldb_context *ldb, tree = ldb_parse_tree(ldb, expression); if (tree == NULL) { - ldb_set_errstring(ldb->modules, talloc_strdup(ldb, "Unable to parse search expression")); + ldb_set_errstring(ldb, talloc_strdup(ldb, "Unable to parse search expression")); return -1; } diff --git a/source4/lib/ldb/common/ldb_debug.c b/source4/lib/ldb/common/ldb_debug.c index 21b02956b8..c4718c7f52 100644 --- a/source4/lib/ldb/common/ldb_debug.c +++ b/source4/lib/ldb/common/ldb_debug.c @@ -97,7 +97,7 @@ void ldb_debug_set(struct ldb_context *ldb, enum ldb_debug_level level, msg = talloc_vasprintf(ldb, fmt, ap); va_end(ap); if (msg != NULL) { - ldb_set_errstring(ldb->modules, msg); + ldb_set_errstring(ldb, msg); ldb_debug(ldb, level, "%s", msg); } } -- cgit