s3: winbindd_cli_state->getgrent_state is no longer used
[ira/wip.git] / libgpo / gpext / gpext.c
index 82c0459e453dfcc6ee381dc2ebe098d53caebaa0..b6cc410eec922d44370272952a22417c5e62e143 100644 (file)
@@ -586,7 +586,7 @@ NTSTATUS init_gp_extensions(TALLOC_CTX *mem_ctx)
                        }
 
                        if (!reg_ctx) {
-                               struct nt_user_token *token;
+                               NT_USER_TOKEN *token;
 
                                token = registry_create_system_token(mem_ctx);
                                NT_STATUS_HAVE_NO_MEMORY(token);
@@ -662,15 +662,15 @@ void debug_gpext_header(int lvl,
        DEBUGADD(lvl,("\tsnapin:        %s (%s)\n", snapin_guid,
                cse_snapin_gpo_guid_string_to_name(snapin_guid)));
 
-       flags_str = gpo_flag_str(flags);
+       flags_str = gpo_flag_str(NULL, flags);
        DEBUGADD(lvl,("\tflags:         0x%08x %s\n", flags, flags_str));
-       SAFE_FREE(flags_str);
+       TALLOC_FREE(flags_str);
 }
 
 NTSTATUS process_gpo_list_with_extension(ADS_STRUCT *ads,
                           TALLOC_CTX *mem_ctx,
                           uint32_t flags,
-                          const struct nt_user_token *token,
+                          const NT_USER_TOKEN *token,
                           struct GROUP_POLICY_OBJECT *gpo_list,
                           const char *extension_guid,
                           const char *snapin_guid)
@@ -684,7 +684,7 @@ NTSTATUS process_gpo_list_with_extension(ADS_STRUCT *ads,
 NTSTATUS gpext_process_extension(ADS_STRUCT *ads,
                                 TALLOC_CTX *mem_ctx,
                                 uint32_t flags,
-                                const struct nt_user_token *token,
+                                const NT_USER_TOKEN *token,
                                 struct registry_key *root_key,
                                 struct GROUP_POLICY_OBJECT *gpo,
                                 const char *extension_guid,