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 6f960d24d02e30f1215b8d58193bf89b05629cd2..99582dabe9d9ac065e64f02f014fb8b31e1c3c71 100644 (file)
--- 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 767bd062b912151ec47677cb6ac03fdf7a5ade14..ce6288cd4ef61fe77ccf49d47cf43140f8b200bb 100644 (file)
--- 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 71e83084481f6f827d96edd246dde22f46170e09..1c76c0d8f5216e4d5fcee15cf2eda80272af702a 100644 (file)
--- 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 18914cab3d909e362f8f187a9a4bb33a1743d361..2d054c1767cdb015fc35b74dd4c2bbd7909bc954 100644 (file)
--- 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 29d57aa4ea84be41ec31688a7e068b88465e9776..a63c626c57bb027d0acb3510aebaebe639b3271a 100644 (file)
--- 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 */