Revert "s4:registry - "util" - make "reg_key_add_abs" consistent with "reg_key_del_abs""
authorWilco Baan Hofman <wilco@baanhofman.nl>
Sun, 28 Mar 2010 14:18:46 +0000 (16:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 29 Mar 2010 16:43:59 +0000 (18:43 +0200)
This reverts commit 9d8592978e28c492d971a3b5a4c0133febc149ea.

Conflicts:

source4/lib/registry/util.c

Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
source4/lib/registry/util.c

index 56d215cab719ebc32d41ff068f3273433fff2812..5bc0a639506d2d2470cc23e9b35a88728c2a3c54 100644 (file)
@@ -272,13 +272,16 @@ WERROR reg_key_add_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_add_name(mem_ctx, parent, n, NULL, sec_desc,
-                                        result);
-
-               talloc_free(parent);
-               talloc_free(n);
+       if (!W_ERROR_IS_OK(error)) {
+               DEBUG(2, ("Opening parent of %s failed with %s\n", path,
+                                 win_errstr(error)));
+               return error;
        }
 
+       error = reg_key_add_name(mem_ctx, parent, n, NULL, sec_desc, result);
+
+       talloc_free(parent);
+       talloc_free(n);
+
        return error;
 }