summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/fhandler_disk_file.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2007-07-30 10:58:16 +0000
committerCorinna Vinschen <corinna@vinschen.de>2007-07-30 10:58:16 +0000
commit378692ee42bb29280c439600832e84a0ddb7471a (patch)
tree180947c247b5c35e3bc21bbd5d37dc3edb993291 /winsup/cygwin/fhandler_disk_file.cc
parent73151c54d58148eed83117dfa69f9da404fe53ac (diff)
downloadcygnal-378692ee42bb29280c439600832e84a0ddb7471a.tar.gz
cygnal-378692ee42bb29280c439600832e84a0ddb7471a.tar.bz2
cygnal-378692ee42bb29280c439600832e84a0ddb7471a.zip
* fhandler_disk_file.cc (fhandler_disk_file::facl): If file can't be
opened for reading the ACLs, fall back to faking them. * sec_acl.cc (acl_worker): Handle non-existing files. * security.cc (get_file_attribute): Return ILLEGAL_UID/ILLEGAL_GID as owner/group for non-readable ACLs on file systems supporting them.
Diffstat (limited to 'winsup/cygwin/fhandler_disk_file.cc')
-rw-r--r--winsup/cygwin/fhandler_disk_file.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 46b178fb7..a5a7c4b53 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -841,6 +841,7 @@ fhandler_disk_file::facl (int cmd, int nentries, __aclent32_t *aclbufp)
if (!pc.has_acls () || !allow_ntsec)
{
+cant_access_acl:
switch (cmd)
{
struct __stat64 st;
@@ -895,9 +896,13 @@ fhandler_disk_file::facl (int cmd, int nentries, __aclent32_t *aclbufp)
{
if (!get_handle ())
{
- query_open (cmd == SETACL ? query_write_control : query_read_attributes);
+ query_open (cmd == SETACL ? query_write_control : query_read_control);
if (!(oret = open (O_BINARY, 0)))
- return -1;
+ {
+ if (cmd == GETACL || cmd == GETACLCNT)
+ goto cant_access_acl;
+ return -1;
+ }
}
switch (cmd)
{