libgpo: remove some unused code and remove that important FIXME note.
authorGünther Deschner <gd@samba.org>
Thu, 19 Dec 2013 16:28:35 +0000 (17:28 +0100)
committerAndreas Schneider <asn@samba.org>
Tue, 7 Jan 2014 15:59:39 +0000 (16:59 +0100)
Guenther

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

index 412ab7a969ffa0136de37d0fc781b25309d27b2b..b654d4ad58400d3d81760a69e42f922d59d217db 100644 (file)
@@ -425,99 +425,6 @@ bool gpo_get_gp_ext_from_gpo(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-static NTSTATUS gpo_process_a_gpo(TALLOC_CTX *mem_ctx,
-                                 const struct security_token *token,
-                                 struct registry_key *root_key,
-                                 struct GROUP_POLICY_OBJECT *gpo,
-                                 const char *extension_guid_filter,
-                                 uint32_t flags)
-{
-       struct GP_EXT *gp_ext = NULL;
-       int i;
-
-       DEBUG(10,("gpo_process_a_gpo: processing gpo %s (%s)\n",
-               gpo->name, gpo->display_name));
-       if (extension_guid_filter) {
-               DEBUGADD(10,("gpo_process_a_gpo: using filter %s (%s)\n",
-                       extension_guid_filter,
-                       cse_gpo_guid_string_to_name(extension_guid_filter)));
-       }
-
-       if (!gpo_get_gp_ext_from_gpo(mem_ctx, flags, gpo, &gp_ext)) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       if (!gp_ext || !gp_ext->num_exts) {
-               if (flags & GPO_INFO_FLAG_VERBOSE) {
-                       DEBUG(0,("gpo_process_a_gpo: "
-                               "no policies in %s (%s) for this extension\n",
-                               gpo->name, gpo->display_name));
-               }
-               return NT_STATUS_OK;
-       }
-
-       for (i=0; i<gp_ext->num_exts; i++) {
-
-               NTSTATUS ntstatus;
-
-               if (extension_guid_filter &&
-                   !strequal(extension_guid_filter,
-                             gp_ext->extensions_guid[i])) {
-                       continue;
-               }
-
-               ntstatus = gpext_process_extension(mem_ctx,
-                                                  flags, token, root_key,
-                                                  NULL, gpo,
-                                                  gp_ext->extensions_guid[i]);
-               if (!NT_STATUS_IS_OK(ntstatus)) {
-                       return ntstatus;
-               }
-       }
-
-       return NT_STATUS_OK;
-}
-
-/****************************************************************
-****************************************************************/
-
-static NTSTATUS gpo_process_gpo_list_by_ext(TALLOC_CTX *mem_ctx,
-                                           const struct security_token *token,
-                                           struct registry_key *root_key,
-                                           struct GROUP_POLICY_OBJECT *gpo_list,
-                                           const char *extensions_guid,
-                                           uint32_t flags)
-{
-       NTSTATUS status;
-       struct GROUP_POLICY_OBJECT *gpo;
-
-       for (gpo = gpo_list; gpo; gpo = gpo->next) {
-
-               if (gpo->link_type == GP_LINK_LOCAL) {
-                       continue;
-               }
-
-
-               /* FIXME: we need to pass down the *list* down to the
-                * extension, otherwise we cannot store the e.g. the *list* of
-                * logon-scripts correctly (for more then one GPO) */
-
-               status = gpo_process_a_gpo(mem_ctx, token, root_key,
-                                          gpo, extensions_guid, flags);
-
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0,("failed to process gpo by ext: %s\n",
-                               nt_errstr(status)));
-                       return status;
-               }
-       }
-
-       return NT_STATUS_OK;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
                              const struct security_token *token,
                              struct GROUP_POLICY_OBJECT *gpo_list,