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/utils/net_ads_gpo.c | 6 +++--- source3/utils/net_proto.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c index d6f392ae7e..56451ab11e 100644 --- a/source3/utils/net_ads_gpo.c +++ b/source3/utils/net_ads_gpo.c @@ -38,7 +38,7 @@ static int net_ads_gpo_refresh(struct net_context *c, int argc, const char **arg uint32 flags = 0; struct GROUP_POLICY_OBJECT *gpo; NTSTATUS result; - struct nt_user_token *token = NULL; + struct security_token *token = NULL; if (argc < 1 || c->display_usage) { d_printf("%s\n%s\n%s", @@ -301,7 +301,7 @@ static int net_ads_gpo_list(struct net_context *c, int argc, const char **argv) uint32 uac = 0; uint32 flags = 0; struct GROUP_POLICY_OBJECT *gpo_list; - struct nt_user_token *token = NULL; + struct security_token *token = NULL; if (argc < 1 || c->display_usage) { d_printf("%s\n%s\n%s", @@ -371,7 +371,7 @@ static int net_ads_gpo_apply(struct net_context *c, int argc, const char **argv) struct GROUP_POLICY_OBJECT *gpo_list; uint32 uac = 0; uint32 flags = 0; - struct nt_user_token *token = NULL; + struct security_token *token = NULL; const char *filter = NULL; if (argc < 1 || c->display_usage) { diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h index 4791223f2d..1941418a1b 100644 --- a/source3/utils/net_proto.h +++ b/source3/utils/net_proto.h @@ -30,8 +30,8 @@ bool nt_token_check_sid ( const struct dom_sid *sid, const NT_USER_TOKEN *token bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid ); NT_USER_TOKEN *get_root_nt_token( void ); NTSTATUS add_aliases(const struct dom_sid *domain_sid, - struct nt_user_token *token); -struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx, + struct security_token *token); +struct security_token *create_local_nt_token(TALLOC_CTX *mem_ctx, const struct dom_sid *user_sid, bool is_guest, int num_groupsids, -- cgit