diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-02-09 16:52:35 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2011-02-10 06:51:06 +0100 |
commit | 2b05ba77b4e072bb1c584738cc79538166444fd3 (patch) | |
tree | 51d3c787ac9415e049138604495bcd40b80b03f7 /source3/rpc_server/srv_wkssvc_nt.c | |
parent | d66150c14def46711a15a35b4734e8f438b6dad6 (diff) | |
download | samba-2b05ba77b4e072bb1c584738cc79538166444fd3.tar.gz samba-2b05ba77b4e072bb1c584738cc79538166444fd3.tar.bz2 samba-2b05ba77b4e072bb1c584738cc79538166444fd3.zip |
s3-auth Rename cryptic 'ptok' to security_token
This will allow the auth_serversupplied_info struct to be migrated
to auth_session_info easier.
Adnrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/rpc_server/srv_wkssvc_nt.c')
-rw-r--r-- | source3/rpc_server/srv_wkssvc_nt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c index 000b605913..3926ceb27a 100644 --- a/source3/rpc_server/srv_wkssvc_nt.c +++ b/source3/rpc_server/srv_wkssvc_nt.c @@ -352,7 +352,7 @@ WERROR _wkssvc_NetWkstaGetInfo(struct pipes_struct *p, case 101: /* Level 101 can be allowed from any logged in user */ if (!nt_token_check_sid(&global_sid_Authenticated_Users, - p->server_info->ptok)) { + p->server_info->security_token)) { DEBUG(1,("User not allowed for NetWkstaGetInfo level " "101\n")); DEBUGADD(3,(" - does not have sid for Authenticated " @@ -360,7 +360,7 @@ WERROR _wkssvc_NetWkstaGetInfo(struct pipes_struct *p, sid_string_dbg( &global_sid_Authenticated_Users))); security_token_debug(DBGC_CLASS, 3, - p->server_info->ptok); + p->server_info->security_token); return WERR_ACCESS_DENIED; } r->out.info->info101 = create_wks_info_101(p->mem_ctx); @@ -371,14 +371,14 @@ WERROR _wkssvc_NetWkstaGetInfo(struct pipes_struct *p, case 102: /* Level 102 Should only be allowed from a domain administrator */ if (!nt_token_check_sid(&global_sid_Builtin_Administrators, - p->server_info->ptok)) { + p->server_info->security_token)) { DEBUG(1,("User not allowed for NetWkstaGetInfo level " "102\n")); DEBUGADD(3,(" - does not have sid for Administrators " "group %s, sids are:\n", sid_string_dbg(&global_sid_Builtin_Administrators))); security_token_debug(DBGC_CLASS, 3, - p->server_info->ptok); + p->server_info->security_token); return WERR_ACCESS_DENIED; } r->out.info->info102 = create_wks_info_102(p->mem_ctx); @@ -557,12 +557,12 @@ WERROR _wkssvc_NetWkstaEnumUsers(struct pipes_struct *p, { /* This with any level should only be allowed from a domain administrator */ if (!nt_token_check_sid(&global_sid_Builtin_Administrators, - p->server_info->ptok)) { + p->server_info->security_token)) { DEBUG(1,("User not allowed for NetWkstaEnumUsers\n")); DEBUGADD(3,(" - does not have sid for Administrators group " "%s\n", sid_string_dbg( &global_sid_Builtin_Administrators))); - security_token_debug(DBGC_CLASS, 3, p->server_info->ptok); + security_token_debug(DBGC_CLASS, 3, p->server_info->security_token); return WERR_ACCESS_DENIED; } @@ -813,7 +813,7 @@ WERROR _wkssvc_NetrJoinDomain2(struct pipes_struct *p, char *admin_domain = NULL; char *admin_account = NULL; WERROR werr; - struct security_token *token = p->server_info->ptok; + struct security_token *token = p->server_info->security_token; if (!r->in.domain_name) { return WERR_INVALID_PARAM; @@ -888,7 +888,7 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct pipes_struct *p, char *admin_domain = NULL; char *admin_account = NULL; WERROR werr; - struct security_token *token = p->server_info->ptok; + struct security_token *token = p->server_info->security_token; if (!r->in.account || !r->in.encrypted_password) { return WERR_INVALID_PARAM; |