summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-03-22 02:22:54 +0100
committerMichael Adam <obnox@samba.org>2008-03-22 02:29:34 +0100
commit39067a5dbd627fdc3c5c94924154fa67bb468614 (patch)
tree0f8cbb5d589d27a261d9d1d851b8a025086db6e6
parent178c430821e5c564d5a50bc067424a428e6350ca (diff)
downloadsamba-39067a5dbd627fdc3c5c94924154fa67bb468614.tar.gz
samba-39067a5dbd627fdc3c5c94924154fa67bb468614.tar.bz2
samba-39067a5dbd627fdc3c5c94924154fa67bb468614.zip
libgpo: use reg_setkeysecurity() instead of regdb_set_secdesc().
That is, use the reg_api function instead of the backend function. For this, code had to be changed, to take a "struct registry_key" instead of a char *. Michael (This used to be commit 4717e6d0cf9df53a55e5d55ede5480181b33920d)
-rw-r--r--source3/libgpo/gpo_reg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 2a27a7ed93..e1edde135a 100644
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/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, KEY_GROUP_POLICY,
+ werr = gp_secure_key(mem_ctx, flags, reg_ctx->curr_key,
&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,
- const char *key,
+ struct registry_key *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 gp_reg_set_secdesc(key, sd);
+ return reg_setkeysecurity(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,
- entry->key,
+ key,
&token->user_sids[0]);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("reg_apply_registry_entry: "