summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-07-03 12:35:16 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-07-03 12:35:16 +0200
commitde81160e754cfb65a471f29e03b6e1f1c1461eb2 (patch)
tree19ea805331caeb57f681ed1176547d00ba07e9c9 /source4/dsdb
parent43b0c314d80efdaec17d601929d3e6b0cdebcff0 (diff)
downloadsamba-de81160e754cfb65a471f29e03b6e1f1c1461eb2.tar.gz
samba-de81160e754cfb65a471f29e03b6e1f1c1461eb2.tar.bz2
samba-de81160e754cfb65a471f29e03b6e1f1c1461eb2.zip
s4:schema_load.c - jump to "failed" on an error condition
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/schema_load.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index cffe529a05..9d9c9ebcd7 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_load.c
@@ -228,15 +228,14 @@ static int dsdb_schema_from_db(struct ldb_module *module, struct ldb_dn *schema_
(*schema)->loaded_from_module = module;
(*schema)->loaded_usn = current_usn;
- /* dsdb_set_schema() steal schema into the ldb_context */
+ /* "dsdb_set_schema()" steals schema into the ldb_context */
ret = dsdb_set_schema(ldb, (*schema));
if (ret != LDB_SUCCESS) {
ldb_debug_set(ldb, LDB_DEBUG_FATAL,
"schema_load_init: dsdb_set_schema() failed: %d:%s: %s",
ret, ldb_strerror(ret), ldb_errstring(ldb));
- talloc_free(tmp_ctx);
- return ret;
+ goto failed;
}
/* Ensure this module won't go away before the callback */