diff options
| author | Wilco Baan Hofman <wilco@baanhofman.nl> | 2010-03-28 16:30:43 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-03-29 18:43:59 +0200 |
| commit | cb670f366cdc7d3dd457bd40fc37349c4484b54b (patch) | |
| tree | 053c0b095c36f3a79298aae61ce73bc029a24fa3 | |
| parent | f8e67f198ad6e42f7563390012f30fffe43b92f7 (diff) | |
| download | samba-cb670f366cdc7d3dd457bd40fc37349c4484b54b.tar.gz samba-cb670f366cdc7d3dd457bd40fc37349c4484b54b.tar.bz2 samba-cb670f366cdc7d3dd457bd40fc37349c4484b54b.zip | |
Revert "s4:registry - adaptions for "add memory contexts for delete value/key functions""
This reverts commit 43170dafbcbe7464bce9b4c6d76532d7d0bf5b9a.
Conflicts:
source4/lib/registry/dir.c
source4/lib/registry/util.c
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
| -rw-r--r-- | source4/lib/registry/util.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c index 5bc0a63950..35d2025411 100644 --- a/source4/lib/registry/util.c +++ b/source4/lib/registry/util.c @@ -234,11 +234,12 @@ static WERROR get_abs_parent(TALLOC_CTX *mem_ctx, struct registry_context *ctx, return WERR_OK; } -WERROR reg_key_del_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx, - const char *path) +WERROR reg_key_del_abs(struct registry_context *ctx, const char *path) { struct registry_key *parent; char *n; + const char *n; + TALLOC_CTX *mem_ctx = talloc_init("reg_key_del_abs"); WERROR error; if (!strchr(path, '\\')) { @@ -252,6 +253,8 @@ WERROR reg_key_del_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx, talloc_free(parent); talloc_free(n); } + talloc_free(mem_ctx); + return error; } |