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/security.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/security.cc')
-rw-r--r-- | winsup/cygwin/security.cc | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index 021065a32..b4c7caf2c 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -29,12 +29,6 @@ details. */ | GROUP_SECURITY_INFORMATION \ | OWNER_SECURITY_INFORMATION) -/* Set ntsec explicit as default. */ -bool allow_ntsec = true; -/* allow_smbntsec is handled exclusively in path.cc (path_conv::check). - It's defined here because of it's strong relationship to allow_ntsec. */ -bool allow_smbntsec; - LONG get_file_sd (HANDLE fh, path_conv &pc, security_descriptor &sd) { @@ -310,15 +304,12 @@ int get_reg_attribute (HKEY hkey, mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret) { - if (allow_ntsec) - { - security_descriptor sd; + security_descriptor sd; - if (!get_reg_sd (hkey, sd)) - { - get_info_from_sd (sd, attribute, uidret, gidret); - return 0; - } + if (!get_reg_sd (hkey, sd)) + { + get_info_from_sd (sd, attribute, uidret, gidret); + return 0; } /* The entries are already set to default values */ return -1; @@ -328,7 +319,7 @@ int get_file_attribute (HANDLE handle, path_conv &pc, mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret) { - if (pc.has_acls () && allow_ntsec) + if (pc.has_acls ()) { security_descriptor sd; @@ -707,7 +698,7 @@ set_file_attribute (HANDLE handle, path_conv &pc, { int ret = -1; - if (pc.has_acls () && allow_ntsec) + if (pc.has_acls ()) { security_descriptor sd; |