From 8c15cf54ae797d8f01a61228d367b5a785f06d98 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 31 Aug 2010 09:32:52 +1000 Subject: s3-auth Rename NT_USER_TOKEN user_sids -> sids This is closer to the struct security_token from security.idl --- source3/utils/net_ads_gpo.c | 2 +- source3/utils/net_rpc.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c index 57396c76e3..d6f392ae7e 100644 --- a/source3/utils/net_ads_gpo.c +++ b/source3/utils/net_ads_gpo.c @@ -157,7 +157,7 @@ static int net_ads_gpo_refresh(struct net_context *c, int argc, const char **arg { WERROR werr = gp_reg_state_read(mem_ctx, flags, - &token->user_sids[0], + &token->sids[0], &read_list); if (!W_ERROR_IS_OK(werr)) { d_printf(_("failed: %s\n"), win_errstr(werr)); diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index fe94f7ec88..4dd00d3dc2 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -4118,21 +4118,21 @@ static void init_user_token(NT_USER_TOKEN *token, struct dom_sid *user_sid) { token->num_sids = 4; - if (!(token->user_sids = SMB_MALLOC_ARRAY(struct dom_sid, 4))) { + if (!(token->sids = SMB_MALLOC_ARRAY(struct dom_sid, 4))) { d_fprintf(stderr, "malloc %s\n",_("failed")); token->num_sids = 0; return; } - token->user_sids[0] = *user_sid; - sid_copy(&token->user_sids[1], &global_sid_World); - sid_copy(&token->user_sids[2], &global_sid_Network); - sid_copy(&token->user_sids[3], &global_sid_Authenticated_Users); + token->sids[0] = *user_sid; + sid_copy(&token->sids[1], &global_sid_World); + sid_copy(&token->sids[2], &global_sid_Network); + sid_copy(&token->sids[3], &global_sid_Authenticated_Users); } static void free_user_token(NT_USER_TOKEN *token) { - SAFE_FREE(token->user_sids); + SAFE_FREE(token->sids); } static void add_sid_to_token(NT_USER_TOKEN *token, struct dom_sid *sid) @@ -4140,12 +4140,12 @@ static void add_sid_to_token(NT_USER_TOKEN *token, struct dom_sid *sid) if (is_sid_in_token(token, sid)) return; - token->user_sids = SMB_REALLOC_ARRAY(token->user_sids, struct dom_sid, token->num_sids+1); - if (!token->user_sids) { + token->sids = SMB_REALLOC_ARRAY(token->sids, struct dom_sid, token->num_sids+1); + if (!token->sids) { return; } - sid_copy(&token->user_sids[token->num_sids], sid); + sid_copy(&token->sids[token->num_sids], sid); token->num_sids += 1; } @@ -4162,7 +4162,7 @@ static void dump_user_token(struct user_token *token) d_printf("%s\n", token->name); for (i=0; itoken.num_sids; i++) { - d_printf(" %s\n", sid_string_tos(&token->token.user_sids[i])); + d_printf(" %s\n", sid_string_tos(&token->token.sids[i])); } } @@ -4201,7 +4201,7 @@ static void collect_alias_memberships(NT_USER_TOKEN *token) int i; for (i=0; iuser_sids[i]); + collect_sid_memberships(token, token->sids[i]); } } @@ -4410,7 +4410,7 @@ static bool get_user_tokens_from_file(FILE *f, fstrcpy(token->name, line); token->token.num_sids = 0; - token->token.user_sids = NULL; + token->token.sids = NULL; continue; } -- cgit