diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-09-07 17:44:24 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-09-12 05:26:16 +0200 |
| commit | 6638d1036688f7b0f15a1a18c9a251ab0a7ab626 (patch) | |
| tree | 31669a1f287161bc78256798602ce9e27b5cb997 /source3/smbd/posix_acls.c | |
| parent | ac804f0d7f5a93ff2710e213d9213ad9960a15d6 (diff) | |
| download | samba-6638d1036688f7b0f15a1a18c9a251ab0a7ab626.tar.gz samba-6638d1036688f7b0f15a1a18c9a251ab0a7ab626.tar.bz2 samba-6638d1036688f7b0f15a1a18c9a251ab0a7ab626.zip | |
smbd: Remove pre-allocation of ACL array in sys_acl_init()
Instead, this is just handled with realloc in sys_acl_create_entry()
This allows us to remove the size element from the SMB_ACL_T.
Andrew Bartlett
Diffstat (limited to 'source3/smbd/posix_acls.c')
| -rw-r--r-- | source3/smbd/posix_acls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index c5dea9c141..016acf4b31 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2823,7 +2823,7 @@ static bool set_canon_ace_list(files_struct *fsp, { connection_struct *conn = fsp->conn; bool ret = False; - SMB_ACL_T the_acl = sys_acl_init(count_canon_ace_list(the_ace) + 1); + SMB_ACL_T the_acl = sys_acl_init(); canon_ace *p_ace; int i; SMB_ACL_ENTRY_T mask_entry; @@ -4524,7 +4524,7 @@ static bool unix_ex_wire_to_tagtype(unsigned char wire_tt, SMB_ACL_TAG_T *p_tt) static SMB_ACL_T create_posix_acl_from_wire(connection_struct *conn, uint16 num_acls, const char *pdata) { unsigned int i; - SMB_ACL_T the_acl = sys_acl_init(num_acls); + SMB_ACL_T the_acl = sys_acl_init(); if (the_acl == NULL) { return NULL; @@ -4668,7 +4668,7 @@ static bool remove_posix_acl(connection_struct *conn, files_struct *fsp, const c SMB_ACL_ENTRY_T entry; bool ret = False; /* Create a new ACL with only 3 entries, u/g/w. */ - SMB_ACL_T new_file_acl = sys_acl_init(3); + SMB_ACL_T new_file_acl = sys_acl_init(); SMB_ACL_ENTRY_T user_ent = NULL; SMB_ACL_ENTRY_T group_ent = NULL; SMB_ACL_ENTRY_T other_ent = NULL; |