diff options
| author | Volker Lendecke <vl@samba.org> | 2008-04-30 17:42:39 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-05 18:28:59 +0200 |
| commit | 420de035237bb08bc470c9eb820f3da2edaa6805 (patch) | |
| tree | f817453290d8d16e3ef066b321b13fb8325d50f0 /source/smbd/uid.c | |
| parent | 964bd02220c04030d8cb0f97ca9b409400d1238c (diff) | |
| download | samba-420de035237bb08bc470c9eb820f3da2edaa6805.tar.gz samba-420de035237bb08bc470c9eb820f3da2edaa6805.tar.xz samba-420de035237bb08bc470c9eb820f3da2edaa6805.zip | |
Remove "userdom_struct user" from "struct user_struct"
Diffstat (limited to 'source/smbd/uid.c')
| -rw-r--r-- | source/smbd/uid.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/smbd/uid.c b/source/smbd/uid.c index 0b87b93636c..3779c3f6088 100644 --- a/source/smbd/uid.c +++ b/source/smbd/uid.c @@ -97,12 +97,14 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum) } } - if (!user_ok_token(vuser->user.unix_name, vuser->server_info->ptok, + if (!user_ok_token(vuser->server_info->unix_name, + vuser->server_info->ptok, snum)) return(False); readonly_share = is_share_read_only_for_token( - vuser->user.unix_name, vuser->server_info->ptok, SNUM(conn)); + vuser->server_info->unix_name, vuser->server_info->ptok, + SNUM(conn)); token = conn->nt_user_token ? conn->nt_user_token : vuser->server_info->ptok; @@ -132,7 +134,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->server_info->ptok, + vuser->server_info->unix_name, NULL, vuser->server_info->ptok, lp_admin_users(SNUM(conn))); conn->read_only = ent->read_only; @@ -188,7 +190,8 @@ bool change_to_user(connection_struct *conn, uint16 vuid) if ((vuser) && !check_user_ok(conn, vuser, snum)) { DEBUG(2,("change_to_user: SMB user %s (unix user %s, vuid %d) " "not permitted access to share %s.\n", - vuser->user.smb_name, vuser->user.unix_name, vuid, + vuser->server_info->sanitized_username, + vuser->server_info->unix_name, vuid, lp_servicename(snum))); return False; } |