Changeset 988 for vendor/current/libcli/security/secacl.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/libcli/security/secacl.c (modified) (5 diffs)

vendor/current/libcli/security/secacl.c

@@ -1 @@
-/* 
+/*
  *  Unix SMB/Netbios implementation.
  *  SEC_ACL handling routines
@@ -6 +6 @@
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-1998,
  *  Copyright (C) Paul Ashton                  1997-1998.
- *  
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -29 +29 @@
 
 /*******************************************************************
- Create a SEC_ACL structure.  
+ Create a SEC_ACL structure.
 ********************************************************************/
 
-struct security_acl *make_sec_acl(TALLOC_CTX *ctx, 
-                                                                  enum security_acl_revision revision,
-                                                                  int num_aces, struct security_ace *ace_list)
+struct security_acl *make_sec_acl(TALLOC_CTX *ctx,
+                                  enum security_acl_revision revision,
+                                  int num_aces, struct security_ace *ace_list)
 {
         struct security_acl *dst;
         int i;
 
-        if((dst = talloc_zero(ctx, struct security_acl)) == NULL)
+        dst = talloc(ctx, struct security_acl);
+        if (dst == NULL) {
                 return NULL;
+        }
 
         dst->revision = revision;
         dst->num_aces = num_aces;
         dst->size = SEC_ACL_HEADER_SIZE;
+        dst->aces = NULL;
 
         /* Now we need to return a non-NULL address for the ace list even
@@ -52 +55 @@
            positive number. */
 
-        if ((num_aces) && 
-            ((dst->aces = talloc_array(dst, struct security_ace, num_aces))
-             == NULL)) {
+        if (num_aces == 0) {
+                return dst;
+        }
+
+        dst->aces = talloc_array(dst, struct security_ace, num_aces);
+        if (dst->aces == NULL) {
+                TALLOC_FREE(dst);
                 return NULL;
         }
-        
+
         for (i = 0; i < num_aces; i++) {
                 dst->aces[i] = ace_list[i]; /* Structure copy. */
@@ -65 +72 @@
         return dst;
 }
-
-/*******************************************************************
- Duplicate a SEC_ACL structure.  
-********************************************************************/
-
-struct security_acl *dup_sec_acl(TALLOC_CTX *ctx, struct security_acl *src)
-{
-        if(src == NULL)
-                return NULL;
-
-        return make_sec_acl(ctx, src->revision, src->num_aces, src->aces);
-}