diff options
author | Volker Lendecke <vl@samba.org> | 2008-04-29 13:43:10 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2008-05-05 18:28:58 +0200 |
commit | c6d209f8342d56adc52a6c8ab99a4a2e17d409b2 (patch) | |
tree | 33d2d3d0f011a990700c093f02268f4247cef418 /source3/smbd/uid.c | |
parent | bb3755968f5e953340edfb0b71997dddc11badb9 (diff) | |
download | samba-c6d209f8342d56adc52a6c8ab99a4a2e17d409b2.tar.gz samba-c6d209f8342d56adc52a6c8ab99a4a2e17d409b2.tar.bz2 samba-c6d209f8342d56adc52a6c8ab99a4a2e17d409b2.zip |
Remove the unix token info from "struct user_struct"
(This used to be commit aa2299d42adf4d27e707ac755e07be70d0af1bb4)
Diffstat (limited to 'source3/smbd/uid.c')
-rw-r--r-- | source3/smbd/uid.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index 866f954436..0b87b93636 100644 --- a/source3/smbd/uid.c +++ b/source3/smbd/uid.c @@ -177,7 +177,7 @@ bool change_to_user(connection_struct *conn, uint16 vuid) return(True); } else if ((current_user.conn == conn) && (vuser != 0) && (current_user.vuid == vuid) && - (current_user.ut.uid == vuser->uid)) { + (current_user.ut.uid == vuser->server_info->uid)) { DEBUG(4,("change_to_user: Skipping user change - already " "user\n")); return(True); @@ -200,10 +200,10 @@ bool change_to_user(connection_struct *conn, uint16 vuid) num_groups = conn->ngroups; token = conn->nt_user_token; } else if (vuser) { - uid = conn->admin_user ? 0 : vuser->uid; - gid = vuser->gid; - num_groups = vuser->n_groups; - group_list = vuser->groups; + uid = conn->admin_user ? 0 : vuser->server_info->uid; + gid = vuser->server_info->gid; + num_groups = vuser->server_info->n_groups; + group_list = vuser->server_info->groups; token = vuser->server_info->ptok; } else { DEBUG(2,("change_to_user: Invalid vuid used %d in accessing " |