git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4ed5dea
)
Use is_default_acl variable in canonicalise_acl().
author
Jeremy Allison
<jra@samba.org>
Tue, 2 Oct 2012 16:55:09 +0000
(09:55 -0700)
committer
Karolin Seeger
<kseeger@samba.org>
Fri, 5 Oct 2012 07:50:49 +0000
(09:50 +0200)
source3/smbd/posix_acls.c
patch
|
blob
|
history
diff --git
a/source3/smbd/posix_acls.c
b/source3/smbd/posix_acls.c
index e59f54c2b12d3e94dbda5917b89b7e255b42cf83..338ee6cfcaaf803afcd198117834c72ec3fce500 100644
(file)
--- 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;
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;
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->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);
}
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.
*/
* 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;
for ( ace_count = 0, ace = l_head; ace; ace = next_ace, ace_count++) {
next_ace = ace->next;