diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2007-07-27 08:38:00 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2007-07-27 08:38:00 +0000 |
| commit | fe7bbe1504adc15d6d9af71a508cc305fb3f04a1 (patch) | |
| tree | 44de7a4ab8e3dad9da91b26680fc056a935fc31a /winsup/cygwin/fhandler.cc | |
| parent | 214c3a1167c25b0696b118e347a78adf813151a9 (diff) | |
| download | cygnal-fe7bbe1504adc15d6d9af71a508cc305fb3f04a1.tar.gz cygnal-fe7bbe1504adc15d6d9af71a508cc305fb3f04a1.tar.bz2 cygnal-fe7bbe1504adc15d6d9af71a508cc305fb3f04a1.zip | |
* fhandler.h (enum query_state): Drop redundant query_stat_control.
* fhandler.cc (fhandler_base::open): Ditto. Add READ_CONTROL to
access and FILE_OPEN_FOR_BACKUP_INTENT to create_options when opening
for writing. Always set security attributes to avoid calling
has_acls.
* fhandler_disk_file.cc (fhandler_base::fstat_fs): Don't try to
open file twice.
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 0ee0bbb8a..ac9527ad8 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -483,10 +483,6 @@ fhandler_base::open (int flags, mode_t mode) access = READ_CONTROL | FILE_READ_ATTRIBUTES; create_options = FILE_OPEN_FOR_BACKUP_INTENT; break; - case query_stat_control: - access = READ_CONTROL | FILE_READ_ATTRIBUTES; - create_options = FILE_OPEN_FOR_BACKUP_INTENT; - break; case query_write_control: access = READ_CONTROL | WRITE_OWNER | WRITE_DAC | FILE_WRITE_ATTRIBUTES; create_options = FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_FOR_RECOVERY; @@ -503,8 +499,9 @@ fhandler_base::open (int flags, mode_t mode) } else if ((flags & O_ACCMODE) == O_WRONLY) { - access = GENERIC_WRITE | FILE_READ_ATTRIBUTES; - create_options = FILE_OPEN_FOR_RECOVERY; + access = GENERIC_WRITE | READ_CONTROL | FILE_READ_ATTRIBUTES; + create_options = FILE_OPEN_FOR_BACKUP_INTENT + | FILE_OPEN_FOR_RECOVERY; } else { @@ -560,7 +557,7 @@ fhandler_base::open (int flags, mode_t mode) /* If the file should actually be created and ntsec is on, set files attributes. */ - if (allow_ntsec && has_acls ()) + if (allow_ntsec) { set_security_attribute (mode, &sa, sd); attr.SecurityDescriptor = sa.lpSecurityDescriptor; |