s4-dsdb: use ldb_operr() in the dsdb code

[metze/samba/wip.git] / source4 / dsdb / samdb / ldb_modules / update_keytab.c

diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index 620c047cd126e9e966a6377638dbc9ff0d896353..071974f5e40af983e67c0166e52d52083ac33ef0 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -90,8 +90,7 @@ static int add_modified(struct ldb_module *module, struct ldb_dn *dn, bool do_de
        filter = talloc_asprintf(data, "(&(dn=%s)(&(objectClass=kerberosSecret)(privateKeytab=*)))",
                                 ldb_dn_get_linearized(dn));
        if (!filter) {
-               ldb_oom(ldb);
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ldb_oom(ldb);
        }
 
        ret = ldb_search(ldb, data, &res,
@@ -112,16 +111,14 @@ static int add_modified(struct ldb_module *module, struct ldb_dn *dn, bool do_de
        item = talloc(data->changed_dns? (void *)data->changed_dns: (void *)data, struct dn_list);
        if (!item) {
                talloc_free(filter);
-               ldb_oom(ldb);
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ldb_oom(ldb);
        }
 
        item->creds = cli_credentials_init(item);
        if (!item->creds) {
                DEBUG(1, ("cli_credentials_init failed!"));
                talloc_free(filter);
-               ldb_oom(ldb);
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ldb_oom(ldb);
        }
 
        cli_credentials_set_conf(item->creds, ldb_get_opaque(ldb, "loadparm"));
@@ -287,7 +284,7 @@ static int update_kt_add(struct ldb_module *module, struct ldb_request *req)
 
        ac = update_kt_ctx_init(module, req);
        if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ldb_operr(ldb);
        }
 
        ac->dn = req->op.add.message->dn;
@@ -316,7 +313,7 @@ static int update_kt_modify(struct ldb_module *module, struct ldb_request *req)
 
        ac = update_kt_ctx_init(module, req);
        if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ldb_operr(ldb);
        }
 
        ac->dn = req->op.mod.message->dn;
@@ -340,7 +337,7 @@ static int update_kt_delete(struct ldb_module *module, struct ldb_request *req)
 
        ac = update_kt_ctx_init(module, req);
        if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ldb_operr(ldb_module_get_ctx(module));
        }
 
        ac->dn = req->op.del.dn;
@@ -361,7 +358,7 @@ static int update_kt_rename(struct ldb_module *module, struct ldb_request *req)
 
        ac = update_kt_ctx_init(module, req);
        if (ac == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ldb_operr(ldb);
        }
 
        ac->dn = req->op.rename.newdn;
@@ -425,8 +422,7 @@ static int update_kt_init(struct ldb_module *module)
 
        data = talloc(module, struct update_kt_private);
        if (data == NULL) {
-               ldb_oom(ldb);
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ldb_oom(ldb);
        }
 
        data->changed_dns = NULL;