summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-08-30 13:30:38 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-09-11 18:46:10 +1000
commit62e5900cd13f6daf77ab65f70245fe21ac5fd053 (patch)
tree9c598c812b2fbdb2eda0c8e02fee2bf2bfd188e1 /source3/include
parenta53a42ffb88fd6b758b8cacf492bceeb93da09c1 (diff)
downloadsamba-62e5900cd13f6daf77ab65f70245fe21ac5fd053.tar.gz
samba-62e5900cd13f6daf77ab65f70245fe21ac5fd053.tar.bz2
samba-62e5900cd13f6daf77ab65f70245fe21ac5fd053.zip
s3-privs Rework access_check_object() to take two privileges
This allows the privileges bitmap to be used only when setting privileges, and uses an the LUID constant for all 'does this user have this privilege' operations. The advantage is that we now only need one API to determine if a token has a privilege, and much less code needs to know what type is used for the underlying bitmap. Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5a24b158d3..2e8f3c9f7e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5647,9 +5647,10 @@ int fncall_recv(struct tevent_req *req, int *perr);
/* The following definitions come from rpc_server/srv_samr_nt.c */
NTSTATUS access_check_object( struct security_descriptor *psd, struct security_token *token,
- uint64_t *rights, uint32 rights_mask,
- uint32 des_access, uint32 *acc_granted,
- const char *debug);
+ enum sec_privilege needed_priv_1, enum sec_privilege needed_priv_2,
+ uint32 rights_mask,
+ uint32 des_access, uint32 *acc_granted,
+ const char *debug );
void map_max_allowed_access(const struct security_token *nt_token,
const struct unix_user_token *unix_token,
uint32_t *pacc_requested);