JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler.h (enum query_state): Drop redundant query_stat_control.

Browse Source 
* 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.
This commit is contained in:
Corinna Vinschen
2007-07-27 08:38:00 +00:00
parent 214c3a1167
commit fe7bbe1504
4 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/cygwin/fhandler.cc
View File

@ -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;