diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-07-14 20:22:03 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-07-14 20:22:03 +0000 |
| commit | e2406d71aa6a1b632e67f7cd1e53c7d38533cec6 (patch) | |
| tree | ce6d14a7419c4ac381b3e734c91be6018474c9bd /winsup/cygwin/path.cc | |
| parent | bf216dcad6ff26bc9c160402da639fdc89614fb4 (diff) | |
| download | cygnal-e2406d71aa6a1b632e67f7cd1e53c7d38533cec6.tar.gz cygnal-e2406d71aa6a1b632e67f7cd1e53c7d38533cec6.tar.bz2 cygnal-e2406d71aa6a1b632e67f7cd1e53c7d38533cec6.zip | |
Throughout drop allow_ntsec and allow_smbntsec handling.
* environ.cc (set_ntsec): Remove.
(set_smbntsec): Remove.
(known): Remove ntsec and smbntsec options.
* external.cc (check_ntsec): Return true if no filename is given.
* mount.cc (oopts): Add "acl" and "noacl" options. Set MOUNT_NOACL
flag accordingly.
(fillout_mntent): Handle MOUNT_NOACL flag.
* path.h (enum path_types): Add PATH_NOACL.
* security.cc (allow_ntsec): Remove.
(allow_smbntsec): Remove.
* security.h (allow_ntsec): Drop declaration.
(allow_smbntsec): Drop declaration.
* include/sys/mount.h (MOUNT_NOACL): Define.
Diffstat (limited to 'winsup/cygwin/path.cc')
| -rw-r--r-- | winsup/cygwin/path.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index c69f9d88e..0e671bec7 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -516,8 +516,7 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol) is_nfs (RtlEqualUnicodeString (&fsname, &testname, FALSE)); is_cdrom (ffdi.DeviceType == FILE_DEVICE_CD_ROM); - has_acls ((flags () & FS_PERSISTENT_ACLS) - && (allow_smbntsec || !is_remote_drive ())); + has_acls (flags () & FS_PERSISTENT_ACLS); hasgood_inode (((flags () & FILE_PERSISTENT_ACLS) && !is_netapp ()) || is_nfs ()); /* Known file systems with buggy open calls. Further explanation @@ -1231,7 +1230,7 @@ out: if (exists () || fs.update (get_nt_native_path (), NULL)) { debug_printf ("this->path(%s), has_acls(%d)", path, fs.has_acls ()); - if (fs.has_acls () && allow_ntsec) + if (fs.has_acls ()) set_exec (0); /* We really don't know if this is executable or not here but set it to not executable since it will be figured out later by anything which cares about this. */ @@ -1785,7 +1784,7 @@ symlink_worker (const char *oldpath, const char *newpath, bool use_winsym, goto done; } } - if (allow_ntsec && win32_newpath.has_acls ()) + if (win32_newpath.has_acls ()) set_security_attribute (S_IFLNK | STD_RBITS | STD_WBITS, &sa, sd); status = NtCreateFile (&fh, DELETE | FILE_GENERIC_WRITE, |