diff options
| author | Jeremy Allison <jra@samba.org> | 2012-10-02 09:55:09 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-10-02 11:41:35 -0700 |
| commit | 82e7132bdf7c9d4ddead3cd5d845bfe68b93448b (patch) | |
| tree | bb0867bbbb22e65872530b483bd33bad40f96dfc | |
| parent | efb446a38cca448855977666499603d12e1477b4 (diff) | |
| download | samba-82e7132bdf7c9d4ddead3cd5d845bfe68b93448b.tar.gz samba-82e7132bdf7c9d4ddead3cd5d845bfe68b93448b.tar.bz2 samba-82e7132bdf7c9d4ddead3cd5d845bfe68b93448b.zip | |
Use is_default_acl variable in canonicalise_acl().
| -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 531313be90..b74c1b24b3 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2629,6 +2629,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; @@ -2719,7 +2720,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); } @@ -2738,7 +2739,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; |