diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-26 22:08:22 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-11 18:46:06 +1000 |
| commit | d1bb21b0d531ef8f40400716b3e1f6314c7c1e8a (patch) | |
| tree | 8e42569543c2a7a591d206794542290c64a7cebe /source3/auth | |
| parent | 4bfc8d3b1a6f6deacb8845c5d81b4897cc292cfb (diff) | |
| download | samba-d1bb21b0d531ef8f40400716b3e1f6314c7c1e8a.tar.gz samba-d1bb21b0d531ef8f40400716b3e1f6314c7c1e8a.tar.bz2 samba-d1bb21b0d531ef8f40400716b3e1f6314c7c1e8a.zip | |
s3:auth Remove NT_USER_TOKEN
The all UPPER case typedef is no longer the preferred Samba style
and this makes it easier to see that this is the IDL-derivied structure
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/auth')
| -rw-r--r-- | source3/auth/auth_util.c | 4 | ||||
| -rw-r--r-- | source3/auth/token_util.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 9dbe04f4ca..5e3091c7ae 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -388,7 +388,7 @@ bool make_user_info_guest(struct auth_usersupplied_info **user_info) return NT_STATUS_IS_OK(nt_status) ? True : False; } -static NTSTATUS log_nt_token(NT_USER_TOKEN *token) +static NTSTATUS log_nt_token(struct security_token *token) { TALLOC_CTX *frame = talloc_stackframe(); char *command; @@ -929,7 +929,7 @@ const struct auth_serversupplied_info *get_server_info_system(void) bool copy_current_user(struct current_user *dst, struct current_user *src) { gid_t *groups; - NT_USER_TOKEN *nt_token; + struct security_token *nt_token; groups = (gid_t *)memdup(src->ut.groups, sizeof(gid_t) * src->ut.ngroups); diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index e9eee90d70..46637b348b 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -31,10 +31,10 @@ #include "../librpc/gen_ndr/netlogon.h" /**************************************************************************** - Check for a SID in an NT_USER_TOKEN + Check for a SID in an struct security_token ****************************************************************************/ -bool nt_token_check_sid ( const struct dom_sid *sid, const NT_USER_TOKEN *token ) +bool nt_token_check_sid ( const struct dom_sid *sid, const struct security_token *token ) { int i; @@ -49,7 +49,7 @@ bool nt_token_check_sid ( const struct dom_sid *sid, const NT_USER_TOKEN *token return False; } -bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid ) +bool nt_token_check_domain_rid( struct security_token *token, uint32 rid ) { struct dom_sid domain_sid; @@ -79,7 +79,7 @@ bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid ) Create a copy if your need to change it. ******************************************************************************/ -NT_USER_TOKEN *get_root_nt_token( void ) +struct security_token *get_root_nt_token( void ) { struct security_token *token, *for_cache; struct dom_sid u_sid, g_sid; @@ -649,10 +649,10 @@ static NTSTATUS finalize_local_nt_token(struct security_token *result, } /**************************************************************************** - prints a NT_USER_TOKEN to debug output. + prints a struct security_token to debug output. ****************************************************************************/ -void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token) +void debug_nt_user_token(int dbg_class, int dbg_lev, struct security_token *token) { size_t i; |