From 40f5eab5eb515937e1b23cf6762b77c194d29b9d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 19 Jun 2008 16:54:12 +0200 Subject: Wrap the unix token info in a unix_user_token in auth_serversupplied_info No functional change, this is a preparation for more current_user ref removal (This used to be commit dcaedf345e62ab74ea87f0a3fa1e3199c75c5445) --- source3/include/auth.h | 9 ++------- source3/include/smb.h | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'source3/include') diff --git a/source3/include/auth.h b/source3/include/auth.h index 56b8144a24..adcd6e943f 100644 --- a/source3/include/auth.h +++ b/source3/include/auth.h @@ -47,13 +47,8 @@ typedef struct auth_serversupplied_info { check_ntlm_password and the token creation. */ size_t num_sids; - uid_t uid; - gid_t gid; - - /* This groups info is needed for when we become_user() for this uid */ - size_t n_groups; - gid_t *groups; - + struct unix_user_token utok; + /* NT group information taken from the info3 structure */ NT_USER_TOKEN *ptok; diff --git a/source3/include/smb.h b/source3/include/smb.h index 76cc389a10..7ae66f1ced 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -378,10 +378,10 @@ typedef struct nt_user_token { SE_PRIV privileges; } NT_USER_TOKEN; -typedef struct _unix_token { +typedef struct unix_user_token { uid_t uid; gid_t gid; - int ngroups; + size_t ngroups; gid_t *groups; } UNIX_USER_TOKEN; -- cgit