diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:25:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:25:57 +0100 |
| commit | 9551ab8f7b0e69349dc0c1ffb70a6f67163b242c (patch) | |
| tree | 075bfaec7798dc54db47398ab6ebfe68c85b1573 /source3/include/proto.h | |
| parent | 7ab8f373c84c328b197f923287163e83371e7ccb (diff) | |
| parent | 8568b4fa9ff8f6f1a24547ec2ed5e2942b213d9e (diff) | |
| download | samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.gz samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.bz2 samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.zip | |
Merge branch 'master' of git://git.samba.org/samba into convenience
Diffstat (limited to 'source3/include/proto.h')
| -rw-r--r-- | source3/include/proto.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 0e6446be84..e1eab8dc16 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -651,28 +651,6 @@ ssize_t sys_recvfile(int fromfd, size_t count); ssize_t drain_socket(int sockfd, size_t count); -/* The following definitions come from lib/secace.c */ - -bool sec_ace_object(uint8 type); -void sec_ace_copy(SEC_ACE *ace_dest, SEC_ACE *ace_src); -void init_sec_ace(SEC_ACE *t, const DOM_SID *sid, enum security_ace_type type, - uint32 mask, uint8 flag); -NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, SEC_ACE **pp_new, SEC_ACE *old, unsigned *num, DOM_SID *sid, uint32 mask); -NTSTATUS sec_ace_mod_sid(SEC_ACE *ace, size_t num, DOM_SID *sid, uint32 mask); -NTSTATUS sec_ace_del_sid(TALLOC_CTX *ctx, SEC_ACE **pp_new, SEC_ACE *old, uint32 *num, DOM_SID *sid); -bool sec_ace_equal(SEC_ACE *s1, SEC_ACE *s2); -int nt_ace_inherit_comp( SEC_ACE *a1, SEC_ACE *a2); -int nt_ace_canon_comp( SEC_ACE *a1, SEC_ACE *a2); -void dacl_sort_into_canonical_order(SEC_ACE *srclist, unsigned int num_aces); -bool token_sid_in_ace(const NT_USER_TOKEN *token, const SEC_ACE *ace); - -/* The following definitions come from lib/secacl.c */ - -SEC_ACL *make_sec_acl(TALLOC_CTX *ctx, enum security_acl_revision revision, - int num_aces, SEC_ACE *ace_list); -SEC_ACL *dup_sec_acl(TALLOC_CTX *ctx, SEC_ACL *src); -bool sec_acl_equal(SEC_ACL *s1, SEC_ACL *s2); - /* The following definitions come from lib/secdesc.c */ bool sec_desc_equal(SEC_DESC *s1, SEC_DESC *s2); @@ -1253,6 +1231,7 @@ NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx, const struct nt_user_token *token_1, const struct nt_user_token *token_2, struct nt_user_token **token_out); +bool token_sid_in_ace(const NT_USER_TOKEN *token, const SEC_ACE *ace); /* The following definitions come from lib/util_pw.c */ |