diff options
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 9 | ||||
| -rw-r--r-- | source4/lib/gendb.c | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 6e55816d72..630edf1c7a 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -157,6 +157,7 @@ static int password_hash_handle(struct ldb_module *module, struct ldb_request *r /* look again, this time at the copied attribute */ if (!msg2 || (attribute = ldb_msg_find_element(msg2, "sambaPassword")) == NULL ) { + talloc_free(mem_ctx); /* Gah? where did it go? Oh well... */ return LDB_ERR_OPERATIONS_ERROR; } @@ -170,6 +171,7 @@ static int password_hash_handle(struct ldb_module *module, struct ldb_request *r talloc_asprintf(mem_ctx, "sambaPassword_handle: " "attempted set of multiple sambaPassword attributes on %s rejected", ldb_dn_linearize(mem_ctx, dn))); + talloc_free(mem_ctx); return LDB_ERR_CONSTRAINT_VIOLATION; } @@ -184,6 +186,7 @@ static int password_hash_handle(struct ldb_module *module, struct ldb_request *r talloc_asprintf(mem_ctx, "sambaPassword_handle: " "attempted set of multiple sambaPassword attributes on %s rejected", ldb_dn_linearize(mem_ctx, dn))); + talloc_free(mem_ctx); return LDB_ERR_CONSTRAINT_VIOLATION; } @@ -212,6 +215,7 @@ static int password_hash_handle(struct ldb_module *module, struct ldb_request *r /* Send the (modified) request of the original caller down to the database */ ret = ldb_next_request(module, modified_orig_request); if (ret) { + talloc_free(mem_ctx); return ret; } @@ -226,6 +230,8 @@ static int password_hash_handle(struct ldb_module *module, struct ldb_request *r /* Find out the old passwords details of the user */ old_res = search_request->op.search.res; + talloc_steal(mem_ctx, old_res); + talloc_free(search_request); if (old_res->count != 1) { ldb_set_errstring(module, @@ -270,6 +276,9 @@ static int password_hash_handle(struct ldb_module *module, struct ldb_request *r /* Find out the full details of the user */ res = search_request->op.search.res; + talloc_steal(mem_ctx, res); + talloc_free(search_request); + if (res->count != 1) { ldb_set_errstring(module, talloc_asprintf(mem_ctx, "password_hash_handle: " diff --git a/source4/lib/gendb.c b/source4/lib/gendb.c index 7326975c1a..0b3361a2c5 100644 --- a/source4/lib/gendb.c +++ b/source4/lib/gendb.c @@ -42,7 +42,7 @@ int gendb_search_v(struct ldb_context *ldb, int ret; if (format) { - vasprintf(&expr, format, ap); + expr = talloc_vasprintf(mem_ctx, format, ap); if (expr == NULL) { return -1; } @@ -55,7 +55,7 @@ int gendb_search_v(struct ldb_context *ldb, ret = ldb_search(ldb, basedn, scope, expr, attrs, &res); if (ret == LDB_SUCCESS) { - talloc_steal(mem_ctx, res); + talloc_steal(mem_ctx, res->msgs); DEBUG(4,("gendb_search_v: %s %s -> %d\n", basedn?ldb_dn_linearize(mem_ctx,basedn):"NULL", @@ -63,13 +63,13 @@ int gendb_search_v(struct ldb_context *ldb, ret = res->count; *msgs = res->msgs; - + talloc_free(res); } else { DEBUG(4,("gendb_search_v: search failed: %s", ldb_errstring(ldb))); ret = -1; } - free(expr); + talloc_free(expr); return ret; } |