From d1bb21b0d531ef8f40400716b3e1f6314c7c1e8a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 26 Aug 2010 22:08:22 +1000 Subject: s3:auth Remove NT_USER_TOKEN The all UPPER case typedef is no longer the preferred Samba style and this makes it easier to see that this is the IDL-derivied structure Andrew Bartlett Signed-off-by: Andrew Tridgell --- libgpo/gpext/gpext.c | 6 +++--- libgpo/gpext/gpext.h | 8 ++++---- libgpo/gpo.h | 14 +++++++------- libgpo/gpo_ldap.c | 8 ++++---- libgpo/gpo_sec.c | 8 ++++---- libgpo/gpo_util.c | 10 +++++----- 6 files changed, 27 insertions(+), 27 deletions(-) (limited to 'libgpo') diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c index 9a09337871..6b81575024 100644 --- a/libgpo/gpext/gpext.c +++ b/libgpo/gpext/gpext.c @@ -594,7 +594,7 @@ NTSTATUS init_gp_extensions(TALLOC_CTX *mem_ctx) } if (!reg_ctx) { - NT_USER_TOKEN *token; + struct security_token *token; token = registry_create_system_token(mem_ctx); NT_STATUS_HAVE_NO_MEMORY(token); @@ -678,7 +678,7 @@ void debug_gpext_header(int lvl, NTSTATUS process_gpo_list_with_extension(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, uint32_t flags, - const NT_USER_TOKEN *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo_list, const char *extension_guid, const char *snapin_guid) @@ -692,7 +692,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 NT_USER_TOKEN *token, + const struct security_token *token, struct registry_key *root_key, struct GROUP_POLICY_OBJECT *gpo, const char *extension_guid, diff --git a/libgpo/gpext/gpext.h b/libgpo/gpext/gpext.h index 60d9bab8ea..ce999a110e 100644 --- a/libgpo/gpext/gpext.h +++ b/libgpo/gpext/gpext.h @@ -65,7 +65,7 @@ struct gp_extension_methods { TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *root_key, - const NT_USER_TOKEN *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo, const char *extension_guid, const char *snapin_guid); @@ -73,7 +73,7 @@ struct gp_extension_methods { NTSTATUS (*process_group_policy2)(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, uint32_t flags, - const NT_USER_TOKEN *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo_list, const char *extension_guid); @@ -109,14 +109,14 @@ void debug_gpext_header(int lvl, NTSTATUS process_gpo_list_with_extension(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, uint32_t flags, - const NT_USER_TOKEN *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo_list, const char *extension_guid, const char *snapin_guid); NTSTATUS gpext_process_extension(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, uint32_t flags, - const NT_USER_TOKEN *token, + const struct security_token *token, struct registry_key *root_key, struct GROUP_POLICY_OBJECT *gpo, const char *extension_guid, diff --git a/libgpo/gpo.h b/libgpo/gpo.h index ba9e0b7962..e6443825ec 100644 --- a/libgpo/gpo.h +++ b/libgpo/gpo.h @@ -156,7 +156,7 @@ struct gp_registry_entries { }; struct gp_registry_context { - const NT_USER_TOKEN *token; + const struct security_token *token; const char *path; struct registry_key *curr_key; }; @@ -215,18 +215,18 @@ ADS_STATUS ads_get_gpo(ADS_STRUCT *ads, ADS_STATUS ads_get_sid_token(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char *dn, - NT_USER_TOKEN **token); + struct security_token **token); ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char *dn, uint32_t flags, - const NT_USER_TOKEN *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT **gpo_list); /* The following definitions come from libgpo/gpo_sec.c */ NTSTATUS gpo_apply_security_filtering(const struct GROUP_POLICY_OBJECT *gpo, - const NT_USER_TOKEN *token); + const struct security_token *token); /* The following definitions come from libgpo/gpo_util.c */ @@ -245,14 +245,14 @@ void dump_gpo_list(ADS_STRUCT *ads, void dump_gplink(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct GP_LINK *gp_link); ADS_STATUS gpo_process_a_gpo(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, - const NT_USER_TOKEN *token, + const struct security_token *token, struct registry_key *root_key, struct GROUP_POLICY_OBJECT *gpo, const char *extension_guid_filter, uint32_t flags); ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, - const NT_USER_TOKEN *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo_list, const char *extensions_guid_filter, uint32_t flags); @@ -282,7 +282,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dn, - NT_USER_TOKEN **token); + struct security_token **token); #include "../libgpo/gpext/gpext.h" diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c index 26a091d18c..c509642892 100644 --- a/libgpo/gpo_ldap.c +++ b/libgpo/gpo_ldap.c @@ -552,7 +552,7 @@ static ADS_STATUS add_gplink_to_gpo_list(ADS_STRUCT *ads, struct GP_LINK *gp_link, enum GPO_LINK_TYPE link_type, bool only_add_forced_gpos, - const NT_USER_TOKEN *token) + const struct security_token *token) { ADS_STATUS status; int i; @@ -619,7 +619,7 @@ static ADS_STATUS add_gplink_to_gpo_list(ADS_STRUCT *ads, ADS_STATUS ads_get_sid_token(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char *dn, - NT_USER_TOKEN **token) + struct security_token **token) { ADS_STATUS status; struct dom_sid object_sid; @@ -628,7 +628,7 @@ ADS_STATUS ads_get_sid_token(ADS_STRUCT *ads, size_t num_ad_token_sids = 0; struct dom_sid *token_sids; uint32_t num_token_sids = 0; - NT_USER_TOKEN *new_token = NULL; + struct security_token *new_token = NULL; int i; status = ads_get_tokensids(ads, mem_ctx, dn, @@ -710,7 +710,7 @@ ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char *dn, uint32_t flags, - const NT_USER_TOKEN *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT **gpo_list) { /* (L)ocal (S)ite (D)omain (O)rganizational(U)nit */ diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c index 6b5e77f20a..099dbaaa77 100644 --- a/libgpo/gpo_sec.c +++ b/libgpo/gpo_sec.c @@ -101,7 +101,7 @@ static bool gpo_sd_check_read_access_bits(uint32_t access_mask) ****************************************************************/ static NTSTATUS gpo_sd_check_ace_denied_object(const struct security_ace *ace, - const NT_USER_TOKEN *token) + const struct security_token *token) { char *sid_str; @@ -123,7 +123,7 @@ static NTSTATUS gpo_sd_check_ace_denied_object(const struct security_ace *ace, ****************************************************************/ static NTSTATUS gpo_sd_check_ace_allowed_object(const struct security_ace *ace, - const NT_USER_TOKEN *token) + const struct security_token *token) { char *sid_str; @@ -146,7 +146,7 @@ static NTSTATUS gpo_sd_check_ace_allowed_object(const struct security_ace *ace, ****************************************************************/ static NTSTATUS gpo_sd_check_ace(const struct security_ace *ace, - const NT_USER_TOKEN *token) + const struct security_token *token) { switch (ace->type) { case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT: @@ -162,7 +162,7 @@ static NTSTATUS gpo_sd_check_ace(const struct security_ace *ace, ****************************************************************/ NTSTATUS gpo_apply_security_filtering(const struct GROUP_POLICY_OBJECT *gpo, - const NT_USER_TOKEN *token) + const struct security_token *token) { struct security_descriptor *sd = gpo->security_descriptor; struct security_acl *dacl = NULL; diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c index 195f61cf27..3320d97b21 100644 --- a/libgpo/gpo_util.c +++ b/libgpo/gpo_util.c @@ -448,7 +448,7 @@ static bool gpo_get_gp_ext_from_gpo(TALLOC_CTX *mem_ctx, ADS_STATUS gpo_process_a_gpo(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, - const NT_USER_TOKEN *token, + const struct security_token *token, struct registry_key *root_key, struct GROUP_POLICY_OBJECT *gpo, const char *extension_guid_filter, @@ -505,7 +505,7 @@ ADS_STATUS gpo_process_a_gpo(ADS_STRUCT *ads, static ADS_STATUS gpo_process_gpo_list_by_ext(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, - const NT_USER_TOKEN *token, + const struct security_token *token, struct registry_key *root_key, struct GROUP_POLICY_OBJECT *gpo_list, const char *extensions_guid, @@ -543,7 +543,7 @@ static ADS_STATUS gpo_process_gpo_list_by_ext(ADS_STRUCT *ads, ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, - const NT_USER_TOKEN *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo_list, const char *extensions_guid_filter, uint32_t flags) @@ -840,9 +840,9 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dn, - NT_USER_TOKEN **token) + struct security_token **token) { - NT_USER_TOKEN *ad_token = NULL; + struct security_token *ad_token = NULL; ADS_STATUS status; #if _SAMBA_BUILD_ == 4 struct auth_session_info *info; -- cgit