diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-07-06 13:21:54 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-07-07 20:14:55 +1000 |
| commit | 87df785a68c1c8043b345b71c98764ef36b76179 (patch) | |
| tree | a4d3071a393661c93e97f9963e492d494241173c /source4/dsdb/samdb/ldb_modules/descriptor.c | |
| parent | fc68558ab937859a91214e8675d53c0afaf3c4e6 (diff) | |
| download | samba-87df785a68c1c8043b345b71c98764ef36b76179.tar.gz samba-87df785a68c1c8043b345b71c98764ef36b76179.tar.bz2 samba-87df785a68c1c8043b345b71c98764ef36b76179.zip | |
s4-dsdb: use ldb_operr() in the dsdb code
this replaces "return LDB_ERR_OPERATIONS_ERROR" with "return ldb_operr(ldb)"
in places in the dsdb code where we don't already explicitly set an
error string. This should make is much easier to track down dsdb
module bugs that result in an operations error.
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/descriptor.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/descriptor.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c index 0e9558278d..d96e18e15f 100644 --- a/source4/dsdb/samdb/ldb_modules/descriptor.c +++ b/source4/dsdb/samdb/ldb_modules/descriptor.c @@ -675,7 +675,7 @@ static int descriptor_do_add(struct descriptor_context *ac) schema = dsdb_get_schema(ldb, ac); mem_ctx = talloc_new(ac); if (mem_ctx == NULL) { - return LDB_ERR_OPERATIONS_ERROR; + return ldb_oom(ldb); } switch (ac->req->operation) { case LDB_ADD: @@ -692,7 +692,7 @@ static int descriptor_do_add(struct descriptor_context *ac) msg = ldb_msg_copy_shallow(ac, ac->req->op.mod.message); break; default: - return LDB_ERR_OPERATIONS_ERROR; + return ldb_operr(ldb); } @@ -791,7 +791,7 @@ static int descriptor_change(struct ldb_module *module, struct ldb_request *req) } break; default: - return LDB_ERR_OPERATIONS_ERROR; + return ldb_operr(ldb); } ldb_debug(ldb, LDB_DEBUG_TRACE,"descriptor_change: %s\n", ldb_dn_get_linearized(dn)); @@ -801,7 +801,7 @@ static int descriptor_change(struct ldb_module *module, struct ldb_request *req) ac = descriptor_init_context(module, req); if (ac == NULL) { - return LDB_ERR_OPERATIONS_ERROR; + return ldb_operr(ldb); } /* If there isn't a parent, just go on to the add processing */ @@ -812,8 +812,7 @@ static int descriptor_change(struct ldb_module *module, struct ldb_request *req) /* get copy of parent DN */ parent_dn = ldb_dn_get_parent(ac, dn); if (parent_dn == NULL) { - ldb_oom(ldb); - return LDB_ERR_OPERATIONS_ERROR; + return ldb_oom(ldb); } ret = ldb_build_search_req(&search_req, ldb, @@ -848,7 +847,7 @@ static int descriptor_search(struct ldb_module *module, struct ldb_request *req) ldb = ldb_module_get_ctx(module); ac = descriptor_init_context(module, req); if (ac == NULL) { - return LDB_ERR_OPERATIONS_ERROR; + return ldb_operr(ldb); } ret = ldb_build_search_req_ex(&down_req, ldb, ac, @@ -884,7 +883,7 @@ static int descriptor_init(struct ldb_module *module) if (ret != LDB_SUCCESS) { ldb_debug(ldb, LDB_DEBUG_ERROR, "descriptor: Unable to register control with rootdse!\n"); - return LDB_ERR_OPERATIONS_ERROR; + return ldb_operr(ldb); } return ldb_next_init(module); } |