diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2003-04-01 17:17:46 +0000 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2003-04-01 17:17:46 +0000 |
commit | 2d388e433f7ec42fe63bf1f8accc59895e5e34f8 (patch) | |
tree | bc2ecb14c42a874a14120f3a1ba298df96aec431 /winsup/cygwin/security.cc | |
parent | 31ee99a41e8050038f346ad238e0955c52fd3f92 (diff) | |
download | cygnal-2d388e433f7ec42fe63bf1f8accc59895e5e34f8.tar.gz cygnal-2d388e433f7ec42fe63bf1f8accc59895e5e34f8.tar.bz2 cygnal-2d388e433f7ec42fe63bf1f8accc59895e5e34f8.zip |
* fhandler.cc (fhandler_base::fstat): Set the uid and gid fields
from the current effective ids.
* fhandler_socket.cc (fhandler_socket::fstat): Keep the uid and gid set
by fhandler_base::fstat.
* security.cc (get_nt_attribute): Do not test wincap.has_security ().
(get_nt_object_attribute): Ditto.
(get_file_attribute): Add test for wincap.has_security ().
(get_object_attribute): Ditto.
Diffstat (limited to 'winsup/cygwin/security.cc')
-rw-r--r-- | winsup/cygwin/security.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index f05fb39ef..82e8f96e2 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -1322,9 +1322,6 @@ static int get_nt_attribute (const char *file, mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret) { - if (!wincap.has_security ()) - return 0; - syscall_printf ("file: %s", file); /* Yeah, sounds too much, but I've seen SDs of 2100 bytes! */ @@ -1391,7 +1388,7 @@ get_file_attribute (int use_ntsec, const char *file, { int res; - if (use_ntsec && allow_ntsec) + if (use_ntsec && allow_ntsec && wincap.has_security ()) { res = get_nt_attribute (file, attribute, uidret, gidret); if (res) @@ -1437,9 +1434,6 @@ static int get_nt_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type, mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret) { - if (!wincap.has_security ()) - return 0; - PSECURITY_DESCRIPTOR psd = NULL; cygpsid owner_sid; cygpsid group_sid; @@ -1548,7 +1542,7 @@ int get_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type, mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret) { - if (allow_ntsec) + if (allow_ntsec && wincap.has_security ()) { int res = get_nt_object_attribute (handle, object_type, attribute, uidret, gidret); |