diff options
| author | Volker Lendecke <vl@samba.org> | 2008-04-29 13:35:00 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-05 18:28:58 +0200 |
| commit | bb3755968f5e953340edfb0b71997dddc11badb9 (patch) | |
| tree | 82fc55583ae6a2c1a689ff654a330cd110d6d66a /source3/smbd/uid.c | |
| parent | faa5e8e12c58376db0323a4e4855454ed53dcc00 (diff) | |
| download | samba-bb3755968f5e953340edfb0b71997dddc11badb9.tar.gz samba-bb3755968f5e953340edfb0b71997dddc11badb9.tar.bz2 samba-bb3755968f5e953340edfb0b71997dddc11badb9.zip | |
Remove "nt_user_token" from "struct user_struct"
(This used to be commit 51d5d512f28eadc74eced43e5e7f4e5bdff3ff69)
Diffstat (limited to 'source3/smbd/uid.c')
| -rw-r--r-- | source3/smbd/uid.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index ffa643a8f5..866f954436 100644 --- a/source3/smbd/uid.c +++ b/source3/smbd/uid.c @@ -97,15 +97,15 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum) } } - if (!user_ok_token(vuser->user.unix_name, vuser->nt_user_token, snum)) + if (!user_ok_token(vuser->user.unix_name, vuser->server_info->ptok, + snum)) return(False); - readonly_share = is_share_read_only_for_token(vuser->user.unix_name, - vuser->nt_user_token, - SNUM(conn)); + readonly_share = is_share_read_only_for_token( + vuser->user.unix_name, vuser->server_info->ptok, SNUM(conn)); token = conn->nt_user_token ? - conn->nt_user_token : vuser->nt_user_token; + conn->nt_user_token : vuser->server_info->ptok; if (!readonly_share && !share_access_check(token, lp_servicename(snum), @@ -132,7 +132,7 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum) ent->read_only = readonly_share; ent->admin_user = token_contains_name_in_list( - vuser->user.unix_name, NULL, vuser->nt_user_token, + vuser->user.unix_name, NULL, vuser->server_info->ptok, lp_admin_users(SNUM(conn))); conn->read_only = ent->read_only; @@ -204,7 +204,7 @@ bool change_to_user(connection_struct *conn, uint16 vuid) gid = vuser->gid; num_groups = vuser->n_groups; group_list = vuser->groups; - token = vuser->nt_user_token; + token = vuser->server_info->ptok; } else { DEBUG(2,("change_to_user: Invalid vuid used %d in accessing " "share %s.\n",vuid, lp_servicename(snum) )); |