diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-01-23 13:08:14 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-01-23 13:08:14 +1100 |
commit | 39d172bf34d0cbb3bf3e3a04d534876097cdccb5 (patch) | |
tree | 3a32fd867e34c9a86c3a2f01308445b76bf2d50c /source3/registry/reg_api.c | |
parent | 2caa0e82f5ff2f45a5c912c624e54c4a43f0c3cc (diff) | |
parent | 9051199e40dec27d3532fbec7f5744033def1874 (diff) | |
download | samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.tar.gz samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.tar.bz2 samba-39d172bf34d0cbb3bf3e3a04d534876097cdccb5.zip |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit bc2973df8504850a40cb0a1172689dc0bdafa323)
Diffstat (limited to 'source3/registry/reg_api.c')
-rw-r--r-- | source3/registry/reg_api.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index 18435ff033..9c4009368d 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -183,7 +183,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx, /* Look up the table of registry I/O operations */ if ( !(key->hook = reghook_cache_find( key->name )) ) { - DEBUG(0,("reg_open_onelevel: Failed to assigned a " + DEBUG(0,("reg_open_onelevel: Failed to assign a " "REGISTRY_HOOK to [%s]\n", key->name )); result = WERR_BADFILE; goto done; @@ -453,7 +453,6 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent, TALLOC_CTX *mem_ctx; char *path, *end; WERROR err; - REGSUBKEY_CTR *subkeys; if (!(mem_ctx = talloc_new(ctx))) return WERR_NOMEM; @@ -517,11 +516,6 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent, * Actually create the subkey */ - if (!(subkeys = TALLOC_ZERO_P(mem_ctx, REGSUBKEY_CTR))) { - err = WERR_NOMEM; - goto done; - } - err = fill_subkey_cache(create_parent); if (!W_ERROR_IS_OK(err)) goto done; |