JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sec_acl.cc (getacl): Add mask even if all group and secondary account

Browse Source 
permissions are 0.
This commit is contained in:
Corinna Vinschen 2015-02-27 14:51:00 +00:00
parent 211cb4df18
commit 83b0e8cffe
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2015-02-27 Corinna Vinschen <corinna@vinschen.de>
* sec_acl.cc (getacl): Add mask even if all group and secondary account
permissions are 0.
2015-02-27 Corinna Vinschen <corinna@vinschen.de> 2015-02-27 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (pwdgrp::fetch_account_from_windows): Drop redundant test * uinfo.cc (pwdgrp::fetch_account_from_windows): Drop redundant test

16
winsup/cygwin/sec_acl.cc
View File

@ -423,6 +423,7 @@ getacl (HANDLE handle, path_conv &pc, int nentries, aclent_t *aclbufp)
int pos, i, types_def = 0; int pos, i, types_def = 0;
int pgrp_pos = 1, def_pgrp_pos = -1; int pgrp_pos = 1, def_pgrp_pos = -1;
bool has_class_perm = false, has_def_class_perm = false;
mode_t class_perm = 0, def_class_perm = 0; mode_t class_perm = 0, def_class_perm = 0;
if (!acl_exists || !acl) if (!acl_exists || !acl)
@ -485,7 +486,10 @@ getacl (HANDLE handle, path_conv &pc, int nentries, aclent_t *aclbufp)
getace (lacl[pos], type, id, ace->Mask, ace->Header.AceType); getace (lacl[pos], type, id, ace->Mask, ace->Header.AceType);
/* Fix up CLASS_OBJ value. */ /* Fix up CLASS_OBJ value. */
if (type == USER || type == GROUP) if (type == USER || type == GROUP)
class_perm |= lacl[pos].a_perm; {
has_class_perm = true;
class_perm |= lacl[pos].a_perm;
}
} }
} }
if ((ace->Header.AceFlags if ((ace->Header.AceFlags
@ -503,7 +507,10 @@ getacl (HANDLE handle, path_conv &pc, int nentries, aclent_t *aclbufp)
getace (lacl[pos], type, id, ace->Mask, ace->Header.AceType); getace (lacl[pos], type, id, ace->Mask, ace->Header.AceType);
/* Fix up DEF_CLASS_OBJ value. */ /* Fix up DEF_CLASS_OBJ value. */
if (type == DEF_USER || type == DEF_GROUP) if (type == DEF_USER || type == DEF_GROUP)
def_class_perm |= lacl[pos].a_perm; {
has_def_class_perm = true;
def_class_perm |= lacl[pos].a_perm;
}
/* And note the position of the DEF_GROUP_OBJ entry. */ /* And note the position of the DEF_GROUP_OBJ entry. */
else if (type == DEF_GROUP_OBJ) else if (type == DEF_GROUP_OBJ)
def_pgrp_pos = pos; def_pgrp_pos = pos;
@ -514,7 +521,7 @@ getacl (HANDLE handle, path_conv &pc, int nentries, aclent_t *aclbufp)
CLASS_OBJ entry. The CLASS_OBJ permissions are the or'ed permissions CLASS_OBJ entry. The CLASS_OBJ permissions are the or'ed permissions
of the primary group permissions and all secondary user and group of the primary group permissions and all secondary user and group
permissions. */ permissions. */
if (class_perm && (pos = searchace (lacl, MAX_ACL_ENTRIES, 0)) >= 0) if (has_class_perm && (pos = searchace (lacl, MAX_ACL_ENTRIES, 0)) >= 0)
{ {
lacl[pos].a_type = CLASS_OBJ; lacl[pos].a_type = CLASS_OBJ;
lacl[pos].a_id = ILLEGAL_GID; lacl[pos].a_id = ILLEGAL_GID;
@ -552,7 +559,8 @@ getacl (HANDLE handle, path_conv &pc, int nentries, aclent_t *aclbufp)
fake a matching DEF_CLASS_OBJ entry. The DEF_CLASS_OBJ permissions are fake a matching DEF_CLASS_OBJ entry. The DEF_CLASS_OBJ permissions are
the or'ed permissions of the primary group default permissions and all the or'ed permissions of the primary group default permissions and all
secondary user and group default permissions. */ secondary user and group default permissions. */
if (def_class_perm && (pos = searchace (lacl, MAX_ACL_ENTRIES, 0)) >= 0) if (has_def_class_perm
&& (pos = searchace (lacl, MAX_ACL_ENTRIES, 0)) >= 0)
{ {
lacl[pos].a_type = DEF_CLASS_OBJ; lacl[pos].a_type = DEF_CLASS_OBJ;
lacl[pos].a_id = ILLEGAL_GID; lacl[pos].a_id = ILLEGAL_GID;