* sec_acl.cc (setacl): Use correct offset when trying to combine
standard and default entry of same type.
This commit is contained in:
parent
7224437c62
commit
bb0906507b
|
@ -1,3 +1,8 @@
|
||||||
|
2004-04-10 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
|
* sec_acl.cc (setacl): Use correct offset when trying to combine
|
||||||
|
standard and default entry of same type.
|
||||||
|
|
||||||
2004-04-10 Pierre Humblet <pierre.humblet@ieee.org>
|
2004-04-10 Pierre Humblet <pierre.humblet@ieee.org>
|
||||||
|
|
||||||
* fhandler.cc (rootdir): Add and use second argument.
|
* fhandler.cc (rootdir): Add and use second argument.
|
||||||
|
|
|
@ -142,11 +142,11 @@ setacl (const char *file, int nentries, __aclent32_t *aclbufp)
|
||||||
aclbufp[i].a_type | ACL_DEFAULT,
|
aclbufp[i].a_type | ACL_DEFAULT,
|
||||||
(aclbufp[i].a_type & (USER|GROUP))
|
(aclbufp[i].a_type & (USER|GROUP))
|
||||||
? aclbufp[i].a_id : ILLEGAL_UID)) >= 0
|
? aclbufp[i].a_id : ILLEGAL_UID)) >= 0
|
||||||
&& aclbufp[i].a_perm == aclbufp[pos].a_perm)
|
&& aclbufp[i].a_perm == aclbufp[i + 1 + pos].a_perm)
|
||||||
{
|
{
|
||||||
inheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT;
|
inheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT;
|
||||||
/* This invalidates the corresponding default entry. */
|
/* This invalidates the corresponding default entry. */
|
||||||
aclbufp[pos].a_type = USER|GROUP|ACL_DEFAULT;
|
aclbufp[i + 1 + pos].a_type = USER|GROUP|ACL_DEFAULT;
|
||||||
}
|
}
|
||||||
switch (aclbufp[i].a_type)
|
switch (aclbufp[i].a_type)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue