summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-10-10 19:36:53 +0000
committerJeremy Allison <jra@samba.org>2001-10-10 19:36:53 +0000
commitde2ece0543bbd0b013310667ebdf33abe78a0ac4 (patch)
treecfdd7a46f83dccb5705ebd1a3c4999cf2d864e71 /source3/rpc_server
parent55abd936a838a4410899db76cb5530b0c4694dc9 (diff)
downloadsamba-de2ece0543bbd0b013310667ebdf33abe78a0ac4.tar.gz
samba-de2ece0543bbd0b013310667ebdf33abe78a0ac4.tar.bz2
samba-de2ece0543bbd0b013310667ebdf33abe78a0ac4.zip
Back-out the share acl fix. Not needed (Gerald has been telling porkies
again :-) :-). Jeremy. (This used to be commit 3b56239c51da3bb24d9ac1ee1442717f597c682a)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index f1dabd64a9..2ae4a73874 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -310,7 +310,6 @@ BOOL share_access_check(connection_struct *conn, int snum, uint16 vuid, uint32 d
NT_USER_TOKEN *token = NULL;
user_struct *vuser = get_valid_user_struct(vuid);
BOOL ret = True;
- BOOL is_root = False;
mem_ctx = talloc_init();
if (mem_ctx == NULL)
@@ -321,24 +320,12 @@ BOOL share_access_check(connection_struct *conn, int snum, uint16 vuid, uint32 d
if (!psd)
goto out;
- if (vuser) {
+ if (vuser)
token = vuser->nt_user_token;
- if (vuser->uid == (uid_t)0)
- is_root = True;
- } else {
+ else
token = conn->nt_user_token;
- if (conn->uid == (uid_t)0)
- is_root = True;
- }
- /*
- * Root gets a free pass.
- */
-
- if (is_root)
- ret = True;
- else
- ret = se_access_check(psd, token, desired_access, &granted, &status);
+ ret = se_access_check(psd, token, desired_access, &granted, &status);
out: