diff options
author | Volker Lendecke <vl@samba.org> | 2008-05-11 01:03:45 +0200 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2008-05-25 11:43:57 +0200 |
commit | 320fadd8fc600262d26ea417a92d395aeb16ef57 (patch) | |
tree | 00190ae813735002e8ec9140014b6bd5693169a7 /source3/smbd/uid.c | |
parent | f4d8141174cf75984978e80b6a040b98423089f6 (diff) | |
download | samba-320fadd8fc600262d26ea417a92d395aeb16ef57.tar.gz samba-320fadd8fc600262d26ea417a92d395aeb16ef57.tar.bz2 samba-320fadd8fc600262d26ea417a92d395aeb16ef57.zip |
Remove the reference to current_user_info from share_access.c
This required to pass around the domain a bit
(This used to be commit 17b0db20d28d1b737c5e86b78106657e8ca5ce9c)
Diffstat (limited to 'source3/smbd/uid.c')
-rw-r--r-- | source3/smbd/uid.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index 310ad4d23a..b0f8cb224b 100644 --- a/source3/smbd/uid.c +++ b/source3/smbd/uid.c @@ -78,12 +78,15 @@ static bool check_user_ok(connection_struct *conn, user_struct *vuser,int snum) } if (!user_ok_token(vuser->server_info->unix_name, + pdb_get_domain(vuser->server_info->sam_account), vuser->server_info->ptok, snum)) return(False); readonly_share = is_share_read_only_for_token( - vuser->server_info->unix_name, vuser->server_info->ptok, + vuser->server_info->unix_name, + pdb_get_domain(vuser->server_info->sam_account), + vuser->server_info->ptok, SNUM(conn)); if (!readonly_share && @@ -127,7 +130,9 @@ 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->server_info->unix_name, NULL, vuser->server_info->ptok, + vuser->server_info->unix_name, + pdb_get_domain(vuser->server_info->sam_account), + NULL, vuser->server_info->ptok, lp_admin_users(SNUM(conn))); conn->read_only = ent->read_only; |