diff options
| author | Jeremy Allison <jra@samba.org> | 2012-10-02 09:55:09 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-11-01 09:10:36 +0100 |
| commit | c9b858347a025a48ef5bee1eefc21be58ce81d98 (patch) | |
| tree | 91cb5b5357e1fe5920999dec08b9fae614cf0b56 | |
| parent | 917f21433057d743123aaaf7fc5742ffdafb4827 (diff) | |
| download | samba-c9b858347a025a48ef5bee1eefc21be58ce81d98.tar.gz | |
Use is_default_acl variable in canonicalise_acl().
(cherry picked from commit 9647be9699b464ee5060e8ccc8328adef6d6641d)
| -rw-r--r-- | source3/smbd/posix_acls.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index e59f54c2b12..338ee6cfcaa 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2416,6 +2416,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn, canon_ace *ace = NULL; canon_ace *next_ace = NULL; int entry_id = SMB_ACL_FIRST_ENTRY; + bool is_default_acl = (the_acl_type == SMB_ACL_TYPE_DEFAULT); SMB_ACL_ENTRY_T entry; size_t ace_count; @@ -2503,7 +2504,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn, ace->trustee = sid; ace->unix_ug = unix_ug; ace->owner_type = owner_type; - ace->ace_flags = get_pai_flags(pal, ace, (the_acl_type == SMB_ACL_TYPE_DEFAULT)); + ace->ace_flags = get_pai_flags(pal, ace, is_default_acl); DLIST_ADD(l_head, ace); } @@ -2522,7 +2523,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn, * acl_mask. Ensure all DENY Entries are at the start of the list. */ - DEBUG(10,("canonicalise_acl: %s ace entries before arrange :\n", the_acl_type == SMB_ACL_TYPE_ACCESS ? "Access" : "Default" )); + DEBUG(10,("canonicalise_acl: %s ace entries before arrange :\n", is_default_acl ? "Default" : "Access")); for ( ace_count = 0, ace = l_head; ace; ace = next_ace, ace_count++) { next_ace = ace->next; |