diff options
| author | Jeremy Allison <jra@samba.org> | 2001-09-26 00:05:03 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-09-26 00:05:03 +0000 |
| commit | 0f4281b9b4a4056e9e087deb15e60ea482af7a74 (patch) | |
| tree | 209555a82bbba203434a9818785f780bdca15890 /source3/rpc_server/srv_srvsvc_nt.c | |
| parent | 6ddcd8a3bcef32694d9d753ff91cced71f5ca3a8 (diff) | |
| download | samba-0f4281b9b4a4056e9e087deb15e60ea482af7a74.tar.gz samba-0f4281b9b4a4056e9e087deb15e60ea482af7a74.tar.bz2 samba-0f4281b9b4a4056e9e087deb15e60ea482af7a74.zip | |
Added Elrond patch to make se_access_check use NT datastructures, not Samba.
Jeremy.
(This used to be commit bca6419447e926e51aeecf3e484228f640cecb84)
Diffstat (limited to 'source3/rpc_server/srv_srvsvc_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 7bc94c5575..2877b7af05 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -308,8 +308,7 @@ BOOL share_access_check(connection_struct *conn, int snum, uint16 vuid, uint32 d TALLOC_CTX *mem_ctx = NULL; SEC_DESC *psd = NULL; size_t sd_size; - struct current_user tmp_user; - struct current_user *puser = NULL; + NT_USER_TOKEN *token = NULL; user_struct *vuser = get_valid_user_struct(vuid); BOOL ret = True; @@ -322,26 +321,12 @@ BOOL share_access_check(connection_struct *conn, int snum, uint16 vuid, uint32 d if (!psd) goto out; - ZERO_STRUCT(tmp_user); - if (vuser) { - tmp_user.vuid = vuid; - tmp_user.uid = vuser->uid; - tmp_user.gid = vuser->gid; - tmp_user.ngroups = vuser->n_groups; - tmp_user.groups = vuser->groups; - tmp_user.nt_user_token = vuser->nt_user_token; - } else { - tmp_user.vuid = vuid; - tmp_user.uid = conn->uid; - tmp_user.gid = conn->gid; - tmp_user.ngroups = conn->ngroups; - tmp_user.groups = conn->groups; - tmp_user.nt_user_token = conn->nt_user_token; - } - - puser = &tmp_user; + if (vuser) + token = vuser->nt_user_token; + else + token = conn->nt_user_token; - ret = se_access_check(psd, puser, desired_access, &granted, &status); + ret = se_access_check(psd, token, desired_access, &granted, &status); out: |