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/winbindd/winbindd_pam.c | 4 ++-- source3/winbindd/winbindd_proto.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/winbindd') diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 83f75f5e56..53eda47d2e 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -261,7 +261,7 @@ static NTSTATUS check_info3_in_group(struct netr_SamInfo3 *info3, const char *p; struct dom_sid sid; size_t i; - struct nt_user_token *token; + struct security_token *token; TALLOC_CTX *frame = talloc_stackframe(); NTSTATUS status; @@ -272,7 +272,7 @@ static NTSTATUS check_info3_in_group(struct netr_SamInfo3 *info3, return NT_STATUS_OK; } - token = talloc_zero(talloc_tos(), struct nt_user_token); + token = talloc_zero(talloc_tos(), struct security_token); if (token == NULL) { DEBUG(0, ("talloc failed\n")); TALLOC_FREE(frame); diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 02b5c66612..c4f02a07f6 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_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