diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-01-26 06:42:40 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-01-26 06:42:40 +0000 |
| commit | 9a751621661bab473334333b4422599bc26164a2 (patch) | |
| tree | 742a43bdccdc8dec7c86ddf6813f6f82aa465c5a /winsup/cygwin/sec_acl.cc | |
| parent | 989c97fe141b5869c3dfd438683b14a8bc8453ca (diff) | |
| download | cygnal-9a751621661bab473334333b4422599bc26164a2.tar.gz cygnal-9a751621661bab473334333b4422599bc26164a2.tar.bz2 cygnal-9a751621661bab473334333b4422599bc26164a2.zip | |
* uinfo.cc (pwdgrp::load): Regularize strace output. Add warning for
CreateFile failure.
Diffstat (limited to 'winsup/cygwin/sec_acl.cc')
| -rw-r--r-- | winsup/cygwin/sec_acl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc index ce3ad41bf..a7fc462a0 100644 --- a/winsup/cygwin/sec_acl.cc +++ b/winsup/cygwin/sec_acl.cc @@ -138,15 +138,15 @@ setacl (const char *file, int nentries, __aclent16_t *aclbufp) */ if (!(aclbufp[i].a_type & ACL_DEFAULT) && aclbufp[i].a_type & (USER|GROUP|OTHER_OBJ) - && (pos = searchace (aclbufp + i + 1, nentries - i - 1, + && (pos = searchace (aclbufp + i + 1, nentries - i - 1, aclbufp[i].a_type | ACL_DEFAULT, (aclbufp[i].a_type & (USER|GROUP)) ? aclbufp[i].a_id : -1)) >= 0 && aclbufp[i].a_perm == aclbufp[pos].a_perm) { inheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT; - /* This invalidates the corresponding default entry. */ - aclbufp[pos].a_type = USER|GROUP|ACL_DEFAULT; + /* This invalidates the corresponding default entry. */ + aclbufp[pos].a_type = USER|GROUP|ACL_DEFAULT; } switch (aclbufp[i].a_type) { @@ -230,7 +230,7 @@ setacl (const char *file, int nentries, __aclent16_t *aclbufp) static void getace (__aclent16_t &acl, int type, int id, DWORD win_ace_mask, - DWORD win_ace_type) + DWORD win_ace_type) { acl.a_type = type; acl.a_id = id; @@ -405,7 +405,7 @@ getacl (const char *file, DWORD attr, int nentries, __aclent16_t *aclbufp) lacl[0].a_perm = lacl[1].a_perm; if (pos > nentries) { - set_errno (ENOSPC); + set_errno (ENOSPC); return -1; } memcpy (aclbufp, lacl, pos * sizeof (__aclent16_t)); |