Changeset 740 for vendor/current/libcli/security/secace.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/libcli/security/secace.c (modified) (12 diffs)

vendor/current/libcli/security/secace.c

@@ -23 +23 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
+#include "lib/util/tsort.h"
 
 #define  SEC_ACE_HEADER_SIZE (2 * sizeof(uint8_t) + sizeof(uint16_t) + sizeof(uint32_t))
@@ -44 +45 @@
  * 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;
@@ -63 +64 @@
         t->type = type;
         t->flags = flag;
-        t->size = ndr_size_dom_sid(sid, NULL, 0) + 8;
+        t->size = ndr_size_dom_sid(sid, 0) + 8;
         t->access_mask = mask;
 
@@ -73 +74 @@
 ********************************************************************/
 
-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;
@@ -89 +90 @@
         (*pp_new)[i].type  = SEC_ACE_TYPE_ACCESS_ALLOWED;
         (*pp_new)[i].flags = 0;
-        (*pp_new)[i].size  = SEC_ACE_HEADER_SIZE + ndr_size_dom_sid(sid, NULL, 0);
+        (*pp_new)[i].size  = SEC_ACE_HEADER_SIZE + ndr_size_dom_sid(sid, 0);
         (*pp_new)[i].access_mask = mask;
         (*pp_new)[i].trustee = *sid;
@@ -99 +100 @@
 ********************************************************************/
 
-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 +119 @@
 ********************************************************************/
 
-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;
@@ -150 +151 @@
 ********************************************************************/
 
-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 +179 @@
 }
 
-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;
@@ -195 +196 @@
 *******************************************************************/
 
-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) &&
@@ -258 +259 @@
 
         /* Sort so that non-inherited ACE's come first. */
-        qsort( srclist, num_aces, sizeof(srclist[0]), QSORT_CAST nt_ace_inherit_comp);
+        TYPESAFE_QSORT(srclist, num_aces, nt_ace_inherit_comp);
 
         /* Find the boundary between non-inherited ACEs. */
@@ -271 +272 @@
 
         /* Sort the non-inherited ACEs. */
-        if (i)
-                qsort( srclist, i, sizeof(srclist[0]), QSORT_CAST nt_ace_canon_comp);
+        TYPESAFE_QSORT(srclist, i, nt_ace_canon_comp);
 
         /* Now sort the inherited ACEs. */
-        if (num_aces - i)
-                qsort( &srclist[i], num_aces - i, sizeof(srclist[0]), QSORT_CAST nt_ace_canon_comp);
-}
-
-
+        TYPESAFE_QSORT(&srclist[i], num_aces - i, nt_ace_canon_comp);
+}
+
+