[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  c69afbb... s4:registry - "reg_key_del/add_abs": call "talloc_free" 
only on valid objects
      from  12f42e3... s4:registry - "reg_import_hive_key" - change a 
"talloc_steal" into a "talloc_reference"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c69afbbfd080c6a0f0d6b6db8745171b3cbc7830
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date:   Mon Mar 22 22:38:45 2010 +0100

    s4:registry - "reg_key_del/add_abs": call "talloc_free" only on valid 
objects

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/registry/util.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c
index 91d1095..456a9d3 100644
--- a/source4/lib/registry/util.c
+++ b/source4/lib/registry/util.c
@@ -248,10 +248,10 @@ WERROR reg_key_del_abs(TALLOC_CTX *mem_ctx, struct 
registry_context *ctx,
        error = get_abs_parent(mem_ctx, ctx, path, &parent, &n);
        if (W_ERROR_IS_OK(error)) {
                error = reg_key_del(mem_ctx, parent, n);
-       }
 
-       talloc_free(parent);
-       talloc_free(n);
+               talloc_free(parent);
+               talloc_free(n);
+       }
 
        return error;
 }
@@ -275,10 +275,10 @@ WERROR reg_key_add_abs(TALLOC_CTX *mem_ctx, struct 
registry_context *ctx,
        if (W_ERROR_IS_OK(error)) {
                error = reg_key_add_name(mem_ctx, parent, n, NULL, sec_desc,
                                         result);
-       }
 
-       talloc_free(parent);
-       talloc_free(n);
+               talloc_free(parent);
+               talloc_free(n);
+       }
 
        return error;
 }


-- 
Samba Shared Repository