diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-18 03:25:38 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-18 12:30:11 +0200 |
| commit | a8b01d1f3b4025af7e7a9d8b61deec6156737322 (patch) | |
| tree | 46f560cfd41acc773857a0cd890fa09e9862a2ef /source3/include | |
| parent | 8bc9c343c4fe4e6f6c0283fd15e86caf6b8c1085 (diff) | |
| download | samba-a8b01d1f3b4025af7e7a9d8b61deec6156737322.tar.gz samba-a8b01d1f3b4025af7e7a9d8b61deec6156737322.tar.bz2 samba-a8b01d1f3b4025af7e7a9d8b61deec6156737322.zip | |
s3-secdesc: remove "typedef struct security_ace SEC_ACE".
Guenther
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/include/rpc_secdes.h | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 69e64d71f0..66babb51f5 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -523,7 +523,7 @@ bool dbghdr(int level, const char *location, const char *func); char *get_sec_mask_str(TALLOC_CTX *ctx, uint32 type); void display_sec_access(uint32_t *info); void display_sec_ace_flags(uint8_t flags); -void display_sec_ace(SEC_ACE *ace); +void display_sec_ace(struct security_ace *ace); void display_sec_acl(SEC_ACL *sec_acl); void display_acl_type(uint16 type); void display_sec_desc(SEC_DESC *sec); @@ -1282,7 +1282,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); +bool token_sid_in_ace(const NT_USER_TOKEN *token, const struct security_ace *ace); /* The following definitions come from lib/util_pw.c */ diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index 0d3db799f4..1936668a80 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -67,13 +67,6 @@ PROTECTED_SACL_SECURITY_INFORMATION|\ PROTECTED_DACL_SECURITY_INFORMATION) -/* SEC_ACE */ -typedef struct security_ace SEC_ACE; - -#ifndef ACL_REVISION -#define ACL_REVISION 0x3 -#endif - #ifndef _SEC_ACL /* SEC_ACL */ typedef struct security_acl SEC_ACL; |