From 8fef712eff881fdd48cfd656856826c9f014406c Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Fri, 13 Dec 2013 15:52:31 +0100 Subject: [PATCH] libgpo: clean up CSE module api, remove unrequired references to ads_struct. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Guenther Signed-off-by: Günther Deschner Reviewed-by: Andreas Schneider --- libgpo/gpext/gpext.c | 3 +-- libgpo/gpext/gpext.h | 6 ++---- source3/libgpo/gpext/registry.c | 3 +-- source3/libgpo/gpext/scripts.c | 3 +-- source3/libgpo/gpext/security.c | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c index df84475754d..8da2c5ea9ea 100644 --- a/libgpo/gpext/gpext.c +++ b/libgpo/gpext/gpext.c @@ -733,8 +733,7 @@ NTSTATUS gpext_process_extension(ADS_STRUCT *ads, status = ext->methods->initialize(mem_ctx); NT_STATUS_NOT_OK_RETURN(status); - status = ext->methods->process_group_policy(ads, - mem_ctx, + status = ext->methods->process_group_policy(mem_ctx, flags, root_key, token, diff --git a/libgpo/gpext/gpext.h b/libgpo/gpext/gpext.h index ce999a110e3..4cd786e02e2 100644 --- a/libgpo/gpext/gpext.h +++ b/libgpo/gpext/gpext.h @@ -61,8 +61,7 @@ struct gp_extension_methods { NTSTATUS (*initialize)(TALLOC_CTX *mem_ctx); - NTSTATUS (*process_group_policy)(ADS_STRUCT *ads, - TALLOC_CTX *mem_ctx, + NTSTATUS (*process_group_policy)(TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *root_key, const struct security_token *token, @@ -70,8 +69,7 @@ struct gp_extension_methods { const char *extension_guid, const char *snapin_guid); - NTSTATUS (*process_group_policy2)(ADS_STRUCT *ads, - TALLOC_CTX *mem_ctx, + NTSTATUS (*process_group_policy2)(TALLOC_CTX *mem_ctx, uint32_t flags, const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo_list, diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c index b0ec7b88d90..3b4c52d9958 100644 --- a/source3/libgpo/gpext/registry.c +++ b/source3/libgpo/gpext/registry.c @@ -269,8 +269,7 @@ done: /**************************************************************** ****************************************************************/ -static NTSTATUS registry_process_group_policy(ADS_STRUCT *ads, - TALLOC_CTX *mem_ctx, +static NTSTATUS registry_process_group_policy(TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *root_key, const struct security_token *token, diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c index 0b6748507a7..3850216b932 100644 --- a/source3/libgpo/gpext/scripts.c +++ b/source3/libgpo/gpext/scripts.c @@ -335,8 +335,7 @@ static WERROR scripts_apply(TALLOC_CTX *mem_ctx, /**************************************************************** ****************************************************************/ -static NTSTATUS scripts_process_group_policy(ADS_STRUCT *ads, - TALLOC_CTX *mem_ctx, +static NTSTATUS scripts_process_group_policy(TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *root_key, const struct security_token *token, diff --git a/source3/libgpo/gpext/security.c b/source3/libgpo/gpext/security.c index 2322bce762c..37d8e4f400f 100644 --- a/source3/libgpo/gpext/security.c +++ b/source3/libgpo/gpext/security.c @@ -140,8 +140,7 @@ static NTSTATUS gpttmpl_process(struct gp_inifile_context *ini_ctx, /**************************************************************** ****************************************************************/ -static NTSTATUS security_process_group_policy(ADS_STRUCT *ads, - TALLOC_CTX *mem_ctx, +static NTSTATUS security_process_group_policy(TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *root_key, const struct security_token *token, -- 2.34.1