From 4bfc8d3b1a6f6deacb8845c5d81b4897cc292cfb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 26 Aug 2010 20:04:11 +1000 Subject: s3-auth Change struct nt_user_token -> struct security_token This common structure is defined in security.idl Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/libgpo/gpext/registry.c | 4 ++-- source3/libgpo/gpext/scripts.c | 6 +++--- source3/libgpo/gpext/security.c | 2 +- source3/libgpo/gpo_proto.h | 8 ++++---- source3/libgpo/gpo_reg.c | 22 +++++++++++----------- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'source3/libgpo') diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c index 90e0a6906d..eb49b19b20 100644 --- a/source3/libgpo/gpext/registry.c +++ b/source3/libgpo/gpext/registry.c @@ -218,7 +218,7 @@ static NTSTATUS reg_parse_registry(TALLOC_CTX *mem_ctx, ****************************************************************/ static WERROR reg_apply_registry(TALLOC_CTX *mem_ctx, - const struct nt_user_token *token, + const struct security_token *token, struct registry_key *root_key, uint32_t flags, struct gp_registry_entry *entries, @@ -273,7 +273,7 @@ static NTSTATUS registry_process_group_policy(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *root_key, - const struct nt_user_token *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo, const char *extension_guid, const char *snapin_guid) diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c index fee1461f01..bc62b811cf 100644 --- a/source3/libgpo/gpext/scripts.c +++ b/source3/libgpo/gpext/scripts.c @@ -260,7 +260,7 @@ static WERROR scripts_store_reg_gpovals(TALLOC_CTX *mem_ctx, ****************************************************************/ static WERROR scripts_apply(TALLOC_CTX *mem_ctx, - const struct nt_user_token *token, + const struct security_token *token, struct registry_key *root_key, uint32_t flags, const char *section, @@ -280,7 +280,7 @@ static WERROR scripts_apply(TALLOC_CTX *mem_ctx, #if 0 if (flags & GPO_INFO_FLAG_MACHINE) { - struct nt_user_token *tmp_token; + struct security_token *tmp_token; tmp_token = registry_create_system_token(mem_ctx); W_ERROR_HAVE_NO_MEMORY(tmp_token); @@ -337,7 +337,7 @@ static NTSTATUS scripts_process_group_policy(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *root_key, - const struct nt_user_token *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo, const char *extension_guid, const char *snapin_guid) diff --git a/source3/libgpo/gpext/security.c b/source3/libgpo/gpext/security.c index 208db700ff..dea0de33f9 100644 --- a/source3/libgpo/gpext/security.c +++ b/source3/libgpo/gpext/security.c @@ -144,7 +144,7 @@ static NTSTATUS security_process_group_policy(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, uint32_t flags, struct registry_key *root_key, - const struct nt_user_token *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo, const char *extension_guid, const char *snapin_guid) diff --git a/source3/libgpo/gpo_proto.h b/source3/libgpo/gpo_proto.h index e77e0351ec..8bc5874c9d 100644 --- a/source3/libgpo/gpo_proto.h +++ b/source3/libgpo/gpo_proto.h @@ -19,11 +19,11 @@ NTSTATUS parse_gpt_ini(TALLOC_CTX *mem_ctx, /* The following definitions come from libgpo/gpo_reg.c */ -struct nt_user_token *registry_create_system_token(TALLOC_CTX *mem_ctx); +struct security_token *registry_create_system_token(TALLOC_CTX *mem_ctx); WERROR gp_init_reg_ctx(TALLOC_CTX *mem_ctx, const char *initial_path, uint32_t desired_access, - const struct nt_user_token *token, + const struct security_token *token, struct gp_registry_context **reg_ctx); void gp_free_reg_ctx(struct gp_registry_context *reg_ctx); WERROR gp_store_reg_subkey(TALLOC_CTX *mem_ctx, @@ -45,7 +45,7 @@ WERROR gp_read_reg_val_sz(TALLOC_CTX *mem_ctx, WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx, uint32_t flags, const char *dn, - const struct nt_user_token *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo_list); WERROR gp_reg_state_read(TALLOC_CTX *mem_ctx, uint32_t flags, @@ -73,5 +73,5 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx, struct registry_key *root_key, struct gp_registry_context *reg_ctx, struct gp_registry_entry *entry, - const struct nt_user_token *token, + const struct security_token *token, uint32_t flags); diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c index 9821dd2178..39d072f689 100644 --- a/source3/libgpo/gpo_reg.c +++ b/source3/libgpo/gpo_reg.c @@ -27,11 +27,11 @@ /**************************************************************** ****************************************************************/ -struct nt_user_token *registry_create_system_token(TALLOC_CTX *mem_ctx) +struct security_token *registry_create_system_token(TALLOC_CTX *mem_ctx) { - struct nt_user_token *token = NULL; + struct security_token *token = NULL; - token = TALLOC_ZERO_P(mem_ctx, struct nt_user_token); + token = TALLOC_ZERO_P(mem_ctx, struct security_token); if (!token) { DEBUG(1,("talloc failed\n")); return NULL; @@ -54,7 +54,7 @@ struct nt_user_token *registry_create_system_token(TALLOC_CTX *mem_ctx) WERROR gp_init_reg_ctx(TALLOC_CTX *mem_ctx, const char *initial_path, uint32_t desired_access, - const struct nt_user_token *token, + const struct security_token *token, struct gp_registry_context **reg_ctx) { struct gp_registry_context *tmp_ctx; @@ -314,7 +314,7 @@ static const char *gp_reg_groupmembership_path(TALLOC_CTX *mem_ctx, static WERROR gp_reg_del_groupmembership(TALLOC_CTX *mem_ctx, struct registry_key *key, - const struct nt_user_token *token, + const struct security_token *token, uint32_t flags) { const char *path = NULL; @@ -332,7 +332,7 @@ static WERROR gp_reg_del_groupmembership(TALLOC_CTX *mem_ctx, static WERROR gp_reg_store_groupmembership(TALLOC_CTX *mem_ctx, struct gp_registry_context *reg_ctx, - const struct nt_user_token *token, + const struct security_token *token, uint32_t flags) { struct registry_key *key = NULL; @@ -377,7 +377,7 @@ static WERROR gp_reg_store_groupmembership(TALLOC_CTX *mem_ctx, static WERROR gp_reg_read_groupmembership(TALLOC_CTX *mem_ctx, struct gp_registry_context *reg_ctx, const struct dom_sid *object_sid, - struct nt_user_token **token, + struct security_token **token, uint32_t flags) { struct registry_key *key = NULL; @@ -388,9 +388,9 @@ static WERROR gp_reg_read_groupmembership(TALLOC_CTX *mem_ctx, const char *path = NULL; uint32_t count = 0; int num_token_sids = 0; - struct nt_user_token *tmp_token = NULL; + struct security_token *tmp_token = NULL; - tmp_token = TALLOC_ZERO_P(mem_ctx, struct nt_user_token); + tmp_token = TALLOC_ZERO_P(mem_ctx, struct security_token); W_ERROR_HAVE_NO_MEMORY(tmp_token); path = gp_reg_groupmembership_path(mem_ctx, object_sid, flags); @@ -453,7 +453,7 @@ static WERROR gp_del_reg_state(TALLOC_CTX *mem_ctx, WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx, uint32_t flags, const char *dn, - const struct nt_user_token *token, + const struct security_token *token, struct GROUP_POLICY_OBJECT *gpo_list) { struct gp_registry_context *reg_ctx = NULL; @@ -950,7 +950,7 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx, struct registry_key *root_key, struct gp_registry_context *reg_ctx, struct gp_registry_entry *entry, - const struct nt_user_token *token, + const struct security_token *token, uint32_t flags) { WERROR werr; -- cgit