* sec_acl.cc (setacl): Use correct offset when trying to combine

	standard and default entry of same type.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2af2567..ba99bbf 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -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>
 
        * fhandler.cc (rootdir): Add and use second argument.

diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc
index 7bcf36c..dc2473e 100644 (file)
--- a/winsup/cygwin/sec_acl.cc
+++ b/winsup/cygwin/sec_acl.cc
@@ -142,11 +142,11 @@ setacl (const char *file, int nentries, __aclent32_t *aclbufp)
                               aclbufp[i].a_type | ACL_DEFAULT,
                               (aclbufp[i].a_type & (USER|GROUP))
                               ? 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;
          /* 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)
        {