The branch, v3-6-test has been updated via e8f3281 More neccessary const. via 4c516ec Add some const. Needed for my SD work. from 3c35914 s3: Fix input check in is_encrypted_packet
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit e8f32819d7294ace4d24d04dd4cd86b85408bc28 Author: Jeremy Allison <j...@samba.org> Date: Fri Oct 8 16:51:24 2010 -0700 More neccessary const. Autobuild-User: Jeremy Allison <j...@samba.org> Autobuild-Date: Sat Oct 9 01:47:25 UTC 2010 on sn-devel-104 (cherry picked from commit 9e1e581120d966f40d3c781fc92b18fc5d63c38a) commit 4c516ec8c38bb421b3752e291be4ac68bf0ef307 Author: Jeremy Allison <j...@samba.org> Date: Fri Oct 8 16:50:40 2010 -0700 Add some const. Needed for my SD work. Jeremy (cherry picked from commit b69bec03cc210ccb2c5373115352a57ca6363f04) ----------------------------------------------------------------------- Summary of changes: libcli/security/secace.c | 14 +++++++------- libcli/security/secace.h | 14 +++++++------- source3/include/proto.h | 2 +- source3/lib/secdesc.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/security/secace.c b/libcli/security/secace.c index 2ee5bfa..5787e15 100644 --- a/libcli/security/secace.c +++ b/libcli/security/secace.c @@ -44,7 +44,7 @@ bool sec_ace_object(uint8_t type) /** * copy a struct security_ace structure. */ -void sec_ace_copy(struct security_ace *ace_dest, struct security_ace *ace_src) +void sec_ace_copy(struct security_ace *ace_dest, const struct security_ace *ace_src) { ace_dest->type = ace_src->type; ace_dest->flags = ace_src->flags; @@ -73,7 +73,7 @@ void init_sec_ace(struct security_ace *t, const struct dom_sid *sid, enum securi adds new SID with its permissions to ACE list ********************************************************************/ -NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct security_ace *old, unsigned *num, struct dom_sid *sid, uint32_t mask) +NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct security_ace *old, unsigned *num, const struct dom_sid *sid, uint32_t mask) { unsigned int i = 0; @@ -99,7 +99,7 @@ NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct s modify SID's permissions at ACL ********************************************************************/ -NTSTATUS sec_ace_mod_sid(struct security_ace *ace, size_t num, struct dom_sid *sid, uint32_t mask) +NTSTATUS sec_ace_mod_sid(struct security_ace *ace, size_t num, const struct dom_sid *sid, uint32_t mask) { unsigned int i = 0; @@ -118,7 +118,7 @@ NTSTATUS sec_ace_mod_sid(struct security_ace *ace, size_t num, struct dom_sid *s delete SID from ACL ********************************************************************/ -NTSTATUS sec_ace_del_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct security_ace *old, uint32_t *num, struct dom_sid *sid) +NTSTATUS sec_ace_del_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct security_ace *old, uint32_t *num, const struct dom_sid *sid) { unsigned int i = 0; unsigned int n_del = 0; @@ -150,7 +150,7 @@ NTSTATUS sec_ace_del_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct s Compares two struct security_ace structures ********************************************************************/ -bool sec_ace_equal(struct security_ace *s1, struct security_ace *s2) +bool sec_ace_equal(const struct security_ace *s1, const struct security_ace *s2) { /* Trivial case */ @@ -178,7 +178,7 @@ bool sec_ace_equal(struct security_ace *s1, struct security_ace *s2) return true; } -int nt_ace_inherit_comp( struct security_ace *a1, struct security_ace *a2) +int nt_ace_inherit_comp(const struct security_ace *a1, const struct security_ace *a2) { int a1_inh = a1->flags & SEC_ACE_FLAG_INHERITED_ACE; int a2_inh = a2->flags & SEC_ACE_FLAG_INHERITED_ACE; @@ -195,7 +195,7 @@ int nt_ace_inherit_comp( struct security_ace *a1, struct security_ace *a2) Comparison function to apply the order explained below in a group. *******************************************************************/ -int nt_ace_canon_comp( struct security_ace *a1, struct security_ace *a2) +int nt_ace_canon_comp( const struct security_ace *a1, const struct security_ace *a2) { if ((a1->type == SEC_ACE_TYPE_ACCESS_DENIED) && (a2->type != SEC_ACE_TYPE_ACCESS_DENIED)) diff --git a/libcli/security/secace.h b/libcli/security/secace.h index 8b6625d..1322177 100644 --- a/libcli/security/secace.h +++ b/libcli/security/secace.h @@ -24,15 +24,15 @@ #include "librpc/gen_ndr/security.h" bool sec_ace_object(uint8_t type); -void sec_ace_copy(struct security_ace *ace_dest, struct security_ace *ace_src); +void sec_ace_copy(struct security_ace *ace_dest, const struct security_ace *ace_src); void init_sec_ace(struct security_ace *t, const struct dom_sid *sid, enum security_ace_type type, uint32_t mask, uint8_t flag); -NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct security_ace *old, unsigned *num, struct dom_sid *sid, uint32_t mask); -NTSTATUS sec_ace_mod_sid(struct security_ace *ace, size_t num, struct dom_sid *sid, uint32_t mask); -NTSTATUS sec_ace_del_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct security_ace *old, uint32_t *num, struct dom_sid *sid); -bool sec_ace_equal(struct security_ace *s1, struct security_ace *s2); -int nt_ace_inherit_comp( struct security_ace *a1, struct security_ace *a2); -int nt_ace_canon_comp( struct security_ace *a1, struct security_ace *a2); +NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct security_ace *old, unsigned *num, const struct dom_sid *sid, uint32_t mask); +NTSTATUS sec_ace_mod_sid(struct security_ace *ace, size_t num, const struct dom_sid *sid, uint32_t mask); +NTSTATUS sec_ace_del_sid(TALLOC_CTX *ctx, struct security_ace **pp_new, struct security_ace *old, uint32_t *num, const struct dom_sid *sid); +bool sec_ace_equal(const struct security_ace *s1, const struct security_ace *s2); +int nt_ace_inherit_comp( const struct security_ace *a1, const struct security_ace *a2); +int nt_ace_canon_comp( const struct security_ace *a1, const struct security_ace *a2); void dacl_sort_into_canonical_order(struct security_ace *srclist, unsigned int num_aces); #endif /*_ACE_H_*/ diff --git a/source3/include/proto.h b/source3/include/proto.h index e97109f..7990070 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -745,7 +745,7 @@ struct security_descriptor *make_standard_sec_desc(TALLOC_CTX *ctx, const struct struct security_acl *dacl, size_t *sd_size); struct sec_desc_buf *make_sec_desc_buf(TALLOC_CTX *ctx, size_t len, struct security_descriptor *sec_desc); struct sec_desc_buf *dup_sec_desc_buf(TALLOC_CTX *ctx, struct sec_desc_buf *src); -NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, struct security_descriptor **psd, struct dom_sid *sid, uint32 mask, size_t *sd_size); +NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, struct security_descriptor **psd, const struct dom_sid *sid, uint32 mask, size_t *sd_size); NTSTATUS sec_desc_mod_sid(struct security_descriptor *sd, struct dom_sid *sid, uint32 mask); NTSTATUS sec_desc_del_sid(TALLOC_CTX *ctx, struct security_descriptor **psd, struct dom_sid *sid, size_t *sd_size); bool sd_has_inheritable_components(const struct security_descriptor *parent_ctr, bool container); diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c index b9ed955..7f018ec 100644 --- a/source3/lib/secdesc.c +++ b/source3/lib/secdesc.c @@ -419,7 +419,7 @@ struct sec_desc_buf *dup_sec_desc_buf(TALLOC_CTX *ctx, struct sec_desc_buf *src) Add a new SID with its permissions to struct security_descriptor. ********************************************************************/ -NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, struct security_descriptor **psd, struct dom_sid *sid, uint32 mask, size_t *sd_size) +NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, struct security_descriptor **psd, const struct dom_sid *sid, uint32 mask, size_t *sd_size) { struct security_descriptor *sd = 0; struct security_acl *dacl = 0; -- Samba Shared Repository