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

* security.cc (alloc_sd): Fix erroneous inheritence entry duplication.

Browse Source
This commit is contained in:
Corinna Vinschen
2010-12-15 13:56:32 +00:00
parent 8d73754622
commit 38042584f3
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,7 @@
2010-12-15 Corinna Vinschen <corinna@vinschen.de>
* security.cc (alloc_sd): Fix erroneous inheritence entry duplication.
2010-12-12 Corinna Vinschen <corinna@vinschen.de> 2010-12-12 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (check_dir_not_empty): Never count more than 3 directory * syscalls.cc (check_dir_not_empty): Never count more than 3 directory

9
winsup/cygwin/security.cc
View File

@@ -648,8 +648,7 @@ alloc_sd (path_conv &pc, __uid32_t uid, __gid32_t gid, int attribute,
if ((ace_sid == cur_owner_sid) if ((ace_sid == cur_owner_sid)
|| (ace_sid == owner_sid) || (ace_sid == owner_sid)
|| (ace_sid == cur_group_sid) || (ace_sid == cur_group_sid)
|| (ace_sid == group_sid) || (ace_sid == group_sid))
|| (ace_sid == well_known_world_sid))
{ {
if (ace->Header.AceFlags if (ace->Header.AceFlags
& (CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE)) & (CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE))
@@ -657,7 +656,11 @@ alloc_sd (path_conv &pc, __uid32_t uid, __gid32_t gid, int attribute,
else else
continue; continue;
} }
else if (attribute & S_JUSTCREATED) else if ((ace_sid == well_known_creator_owner_sid)
|| (ace_sid == well_known_creator_group_sid)
|| (ace_sid == well_known_world_sid))
continue;
if (attribute & S_JUSTCREATED)
{ {
/* Since files and dirs are created with a NULL descriptor, /* Since files and dirs are created with a NULL descriptor,
inheritence rules kick in. If no inheritable entries exist inheritence rules kick in. If no inheritable entries exist