diff options
author | Christopher Faylor <me@cgf.cx> | 2007-03-01 15:13:47 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2007-03-01 15:13:47 +0000 |
commit | 6e070c257c9026b433cdae7b0ad7f2ba909558bf (patch) | |
tree | b9b2ced0b412b53afd7ae4068de5c604c7db6c71 /winsup/cygwin/fhandler_disk_file.cc | |
parent | a49625d566c34c895ed2eac3055977bb07c319b7 (diff) | |
download | cygnal-6e070c257c9026b433cdae7b0ad7f2ba909558bf.tar.gz cygnal-6e070c257c9026b433cdae7b0ad7f2ba909558bf.tar.bz2 cygnal-6e070c257c9026b433cdae7b0ad7f2ba909558bf.zip |
* Makefile (DLL_OFILES): Remove ntea.o
* environ.cc (set_ntea): Delete.
(parse_thing): Delete "ntea" setting.
* fhandler.cc (fhandler_base::open): Remove allow_ntea considerations.
(check_posix_perm): Ditto.
* fhandler_disk_file.cc (fhandler_disk_file::fchmod): Ditto.
(fhandler_base::open_fs): Ditto.
(fhandler_disk_file::mkdir): Ditto.
* path.cc (symlink_worker): Ditto.
* security.cc (get_file_attribute): Ditto.
(set_file_attribute): Ditto.
* security.h: Remove allow_ntea declaration.
Diffstat (limited to 'winsup/cygwin/fhandler_disk_file.cc')
-rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 3e2e059f9..f40bcb52d 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -653,15 +653,13 @@ fhandler_disk_file::fchmod (mode_t mode) { /* If the file couldn't be opened, that's really only a problem if ACLs or EAs should get written. */ - if ((allow_ntsec && pc.has_acls ()) || allow_ntea) + if (allow_ntsec && pc.has_acls ()) return -1; } } - if ((allow_ntsec && pc.has_acls ()) || allow_ntea) + if (allow_ntsec && pc.has_acls ()) { - if (!allow_ntsec && allow_ntea) /* Not necessary when manipulating SD. */ - SetFileAttributes (pc, (DWORD) pc & ~FILE_ATTRIBUTE_READONLY); if (pc.isdir ()) mode |= S_IFDIR; if (!set_file_attribute (pc.has_acls (), get_io_handle (), pc, @@ -1209,14 +1207,6 @@ fhandler_base::open_fs (int flags, mode_t mode) return 0; } - /* Attributes may be set only if a file is _really_ created. - This code is now only used for ntea here since the files - security attributes are set in CreateFile () now. */ - if (flags & O_CREAT - && GetLastError () != ERROR_ALREADY_EXISTS - && !allow_ntsec && allow_ntea) - set_file_attribute (false, NULL, get_win32_name (), mode); - set_fs_flags (pc.fs_flags ()); out: @@ -1435,9 +1425,6 @@ fhandler_disk_file::mkdir (mode_t mode) if (CreateDirectoryA (get_win32_name (), &sa)) { - if (!allow_ntsec && allow_ntea) - set_file_attribute (false, NULL, get_win32_name (), - S_IFDIR | ((mode & 07777) & ~cygheap->umask)); #ifdef HIDDEN_DOT_FILES char *c = strrchr (real_dir.get_win32 (), '\\'); if ((c && c[1] == '.') || *get_win32_name () == '.') |