From: Günther Deschner <gd@samba.org>
Date: Thu, 19 Dec 2013 13:34:53 +0000 (+0100)
Subject: libgpo: remove extension_guid and snapin_guid (the tool guid) from the process callback.
X-Git-Tag: tevent-0.9.21~119
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=1010a011190b04dd2eed86e03b146f157233f084

libgpo: remove extension_guid and snapin_guid (the tool guid) from the process callback.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index 6f960d24d02..99582dabe9d 100644
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -823,9 +823,7 @@ NTSTATUS gpext_process_extension(TALLOC_CTX *mem_ctx,
 							    root_key,
 							    token,
 							    deleted_gpo_list_filtered,
-							    changed_gpo_list_filtered,
-							    extension_guid,
-							    snapin_guid);
+							    changed_gpo_list_filtered);
 		if (!NT_STATUS_IS_OK(status)) {
 			ext->methods->shutdown();
 		}
diff --git a/libgpo/gpext/gpext.h b/libgpo/gpext/gpext.h
index 767bd062b91..ce6288cd4ef 100644
--- a/libgpo/gpext/gpext.h
+++ b/libgpo/gpext/gpext.h
@@ -66,9 +66,7 @@ struct gp_extension_methods {
 					 struct registry_key *root_key,
 					 const struct security_token *token,
 					 struct GROUP_POLICY_OBJECT *deleted_gpo_list,
-					 struct GROUP_POLICY_OBJECT *changed_gpo_list,
-					 const char *extension_guid,
-					 const char *snapin_guid);
+					 struct GROUP_POLICY_OBJECT *changed_gpo_list);
 
 	NTSTATUS (*get_reg_config)(TALLOC_CTX *mem_ctx,
 				   struct gp_extension_reg_info **info);
diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c
index 71e83084481..1c76c0d8f52 100644
--- a/source3/libgpo/gpext/registry.c
+++ b/source3/libgpo/gpext/registry.c
@@ -274,9 +274,7 @@ static NTSTATUS registry_process_group_policy(TALLOC_CTX *mem_ctx,
 					      struct registry_key *root_key,
 					      const struct security_token *token,
 					      struct GROUP_POLICY_OBJECT *deleted_gpo_list,
-					      struct GROUP_POLICY_OBJECT *changed_gpo_list,
-					      const char *extension_guid,
-					      const char *snapin_guid)
+					      struct GROUP_POLICY_OBJECT *changed_gpo_list)
 {
 	NTSTATUS status;
 	WERROR werr;
@@ -299,7 +297,7 @@ static NTSTATUS registry_process_group_policy(TALLOC_CTX *mem_ctx,
 	for (gpo = changed_gpo_list; gpo; gpo = gpo->next) {
 
 		gpext_debug_header(0, "registry_process_group_policy", flags,
-				   gpo, extension_guid, snapin_guid);
+				   gpo, GP_EXT_GUID_REGISTRY, NULL);
 
 		status = gpo_get_unix_path(mem_ctx, cache_path(GPO_CACHE_DIR),
 					   gpo, &unix_path);
diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c
index 18914cab3d9..2d054c1767c 100644
--- a/source3/libgpo/gpext/scripts.c
+++ b/source3/libgpo/gpext/scripts.c
@@ -340,9 +340,7 @@ static NTSTATUS scripts_process_group_policy(TALLOC_CTX *mem_ctx,
 					     struct registry_key *root_key,
 					     const struct security_token *token,
 					     struct GROUP_POLICY_OBJECT *deleted_gpo_list,
-					     struct GROUP_POLICY_OBJECT *changed_gpo_list,
-					     const char *extension_guid,
-					     const char *snapin_guid)
+					     struct GROUP_POLICY_OBJECT *changed_gpo_list)
 {
 	NTSTATUS status;
 	WERROR werr;
@@ -373,7 +371,7 @@ static NTSTATUS scripts_process_group_policy(TALLOC_CTX *mem_ctx,
 	for (gpo = changed_gpo_list; gpo; gpo = gpo->next) {
 
 		gpext_debug_header(0, "scripts_process_group_policy", flags,
-				   gpo, extension_guid, snapin_guid);
+				   gpo, GP_EXT_GUID_SCRIPTS, NULL);
 
 		status = gpo_get_unix_path(mem_ctx, cache_path(GPO_CACHE_DIR),
 					   gpo, &unix_path);
diff --git a/source3/libgpo/gpext/security.c b/source3/libgpo/gpext/security.c
index 29d57aa4ea8..a63c626c57b 100644
--- a/source3/libgpo/gpext/security.c
+++ b/source3/libgpo/gpext/security.c
@@ -145,9 +145,7 @@ static NTSTATUS security_process_group_policy(TALLOC_CTX *mem_ctx,
 					      struct registry_key *root_key,
 					      const struct security_token *token,
 					      struct GROUP_POLICY_OBJECT *deleted_gpo_list,
-					      struct GROUP_POLICY_OBJECT *changed_gpo_list,
-					      const char *extension_guid,
-					      const char *snapin_guid)
+					      struct GROUP_POLICY_OBJECT *changed_gpo_list)
 {
 	NTSTATUS status;
 	char *unix_path = NULL;
@@ -168,7 +166,7 @@ static NTSTATUS security_process_group_policy(TALLOC_CTX *mem_ctx,
 	for (gpo = changed_gpo_list; gpo; gpo = gpo->next) {
 
 		gpext_debug_header(0, "security_process_group_policy", flags,
-				   gpo, extension_guid, snapin_guid);
+				   gpo, GP_EXT_GUID_SECURITY, NULL);
 
 		/* this handler processes the gpttmpl files and merge output to the
 		 * registry */