diff options
| author | Simo Sorce <idra@samba.org> | 2006-02-22 05:21:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:59 -0500 |
| commit | d590dea10b3abf93fcc8138189291e8b66bae7d7 (patch) | |
| tree | d859a38ca49d480c36e3a8a3ef2ac28e2b964066 /source4/lib/ldb/ldb_tdb/ldb_tdb.c | |
| parent | 00fe70e5b917769418f68eaa255d3a06a9a08ce7 (diff) | |
| download | samba-d590dea10b3abf93fcc8138189291e8b66bae7d7.tar.gz samba-d590dea10b3abf93fcc8138189291e8b66bae7d7.tar.bz2 samba-d590dea10b3abf93fcc8138189291e8b66bae7d7.zip | |
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)
Diffstat (limited to 'source4/lib/ldb/ldb_tdb/ldb_tdb.c')
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_tdb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c index 1be11bc64c..8d8c01278d 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c @@ -142,7 +142,7 @@ int ltdb_check_special_dn(struct ldb_module *module, const struct ldb_message *m if (ltdb_check_at_attributes_values(&msg->elements[i].values[j]) != 0) { char *err_string = talloc_strdup(module, "Invalid attribute value in an @ATTRIBUTES entry"); if (err_string) { - ldb_set_errstring(module, err_string); + ldb_set_errstring(module->ldb, err_string); } return LDB_ERR_INVALID_ATTRIBUTE_SYNTAX; } @@ -532,7 +532,7 @@ int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *ms for (j=0;j<el->num_values;j++) { if (ldb_msg_find_val(el2, &el->values[j])) { err_string = talloc_strdup(module, "Type or value exists"); - if (err_string) ldb_set_errstring(module, err_string); + if (err_string) ldb_set_errstring(module->ldb, err_string); ret = LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; goto failed; } @@ -577,7 +577,7 @@ int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *ms if (msg_delete_attribute(module, ldb, msg2, msg->elements[i].name) != 0) { err_string = talloc_asprintf(module, "No such attribute: %s", msg->elements[i].name); - if (err_string) ldb_set_errstring(module, err_string); + if (err_string) ldb_set_errstring(module->ldb, err_string); ret = LDB_ERR_NO_SUCH_ATTRIBUTE; goto failed; } @@ -589,7 +589,7 @@ int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *ms msg->elements[i].name, &msg->elements[i].values[j]) != 0) { err_string = talloc_asprintf(module, "No such attribute: %s", msg->elements[i].name); - if (err_string) ldb_set_errstring(module, err_string); + if (err_string) ldb_set_errstring(module->ldb, err_string); ret = LDB_ERR_NO_SUCH_ATTRIBUTE; goto failed; } @@ -602,7 +602,7 @@ int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *ms err_string = talloc_asprintf(module, "Invalid ldb_modify flags on %s: 0x%x", msg->elements[i].name, msg->elements[i].flags & LDB_FLAG_MOD_MASK); - if (err_string) ldb_set_errstring(module, err_string); + if (err_string) ldb_set_errstring(module->ldb, err_string); ret = LDB_ERR_PROTOCOL_ERROR; goto failed; } @@ -690,7 +690,7 @@ static int ltdb_rename(struct ldb_module *module, const struct ldb_dn *olddn, co ltdb_delete(module, newdn); } - ldb_set_errstring(module, error_str); + ldb_set_errstring(module->ldb, error_str); talloc_free(msg); |