summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-03-12 14:31:47 -0800
committerJeremy Allison <jra@samba.org>2010-03-12 14:31:47 -0800
commita2be29dfa32a675249f743632a24450d5147a112 (patch)
tree4db445dfdecab1001fab91b96e24ab12fa810e1d /source3/include
parente80ceb1d7355c8c46a2ed90d5721cf367640f4e8 (diff)
downloadsamba-a2be29dfa32a675249f743632a24450d5147a112.tar.gz
samba-a2be29dfa32a675249f743632a24450d5147a112.tar.bz2
samba-a2be29dfa32a675249f743632a24450d5147a112.zip
Missed a couple more uses of conn->server_info->ptok that need to be get_current_nttok(conn)
Centralize the root check into smb1_file_se_access_check() so this is used by modules/vfs_acl_common.c also. Jeremy.
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5b4304d27d..6e210de458 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6594,10 +6594,11 @@ void reply_nttranss(struct smb_request *req);
/* The following definitions come from smbd/open.c */
-NTSTATUS smb1_file_se_access_check(const struct security_descriptor *sd,
- const NT_USER_TOKEN *token,
- uint32_t access_desired,
- uint32_t *access_granted);
+NTSTATUS smb1_file_se_access_check(connection_struct *conn,
+ const struct security_descriptor *sd,
+ const NT_USER_TOKEN *token,
+ uint32_t access_desired,
+ uint32_t *access_granted);
NTSTATUS fd_close(files_struct *fsp);
void change_file_owner_to_parent(connection_struct *conn,
const char *inherit_from_dir,