1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00

s4:lib/registry/ldb.c - remove really useless "local_ctx"

"mem_ctx" should fit for these few local allocations.
This commit is contained in:
Matthias Dieter Wallnöfer
2010-06-24 20:11:09 +02:00
parent 3935502c67
commit 2fb3d8a6cc

View File

@ -275,19 +275,15 @@ static struct ldb_dn *reg_path_to_ldb(TALLOC_CTX *mem_ctx,
const struct hive_key *from,
const char *path, const char *add)
{
TALLOC_CTX *local_ctx;
struct ldb_dn *ret;
char *mypath = talloc_strdup(mem_ctx, path);
char *begin;
struct ldb_key_data *kd = talloc_get_type(from, struct ldb_key_data);
struct ldb_context *ldb = kd->ldb;
local_ctx = talloc_new(mem_ctx);
ret = ldb_dn_new(mem_ctx, ldb, add);
if (!ldb_dn_validate(ret)) {
talloc_free(ret);
talloc_free(local_ctx);
return NULL;
}
@ -301,10 +297,10 @@ static struct ldb_dn *reg_path_to_ldb(TALLOC_CTX *mem_ctx,
if (keyname[0] != '\0') {
if (!ldb_dn_add_base_fmt(ret, "key=%s",
reg_ldb_escape(local_ctx,
reg_ldb_escape(mem_ctx,
keyname)))
{
talloc_free(local_ctx);
talloc_free(ret);
return NULL;
}
}
@ -318,8 +314,6 @@ static struct ldb_dn *reg_path_to_ldb(TALLOC_CTX *mem_ctx,
ldb_dn_add_base(ret, kd->dn);
talloc_free(local_ctx);
return ret;
}