Revert "libgpo: use reg_setkeysecurity() instead of regdb_set_secdesc()."

This reverts commit 4717e6d0cf9df53a55e5d55ede5480181b33920d.

diff --git a/source/libgpo/gpo_reg.c b/source/libgpo/gpo_reg.c
index e1edde135a7817af6069944e9e0c081a63e7c59d..2a27a7ed930c2b03eceb18ae7767b7752b4ef173 100644 (file)
--- a/source/libgpo/gpo_reg.c
+++ b/source/libgpo/gpo_reg.c
@@ -515,7 +515,7 @@ WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx,
                               token, &reg_ctx);
        W_ERROR_NOT_OK_RETURN(werr);
 
-       werr = gp_secure_key(mem_ctx, flags, reg_ctx->curr_key,
+       werr = gp_secure_key(mem_ctx, flags, KEY_GROUP_POLICY,
                             &token->user_sids[0]);
        if (!W_ERROR_IS_OK(werr)) {
                DEBUG(0,("failed to secure key: %s\n", dos_errstr(werr)));
@@ -806,7 +806,7 @@ static WERROR gp_reg_generate_sd(TALLOC_CTX *mem_ctx,
 
 WERROR gp_secure_key(TALLOC_CTX *mem_ctx,
                     uint32_t flags,
-                    struct registry_key *key,
+                    const char *key,
                     const DOM_SID *sid)
 {
        struct security_descriptor *sd = NULL;
@@ -821,7 +821,7 @@ WERROR gp_secure_key(TALLOC_CTX *mem_ctx,
        werr = gp_reg_generate_sd(mem_ctx, sd_sid, &sd, &sd_size);
        W_ERROR_NOT_OK_RETURN(werr);
 
-       return reg_setkeysecurity(key, sd);
+       return gp_reg_set_secdesc(key, sd);
 }
 
 /****************************************************************
@@ -1001,7 +1001,7 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
 
                case GP_REG_ACTION_SEC_KEY_SET:
                        werr = gp_secure_key(mem_ctx, flags,
-                                            key,
+                                            entry->key,
                                             &token->user_sids[0]);
                        if (!W_ERROR_IS_OK(werr)) {
                                DEBUG(0,("reg_apply_registry_entry: "