diff options
| author | Pierre Humblet <phumblet@phumblet.no-ip.org> | 2004-10-06 05:33:39 +0400 |
|---|---|---|
| committer | Pierre Humblet <phumblet@phumblet.no-ip.org> | 2004-10-06 05:33:39 +0400 |
| commit | b0637a519141d657c25eb08dd80dd8ad05df6a4e (patch) | |
| tree | f7622d609c11acbbfaa43811691533cfd063d498 | |
| parent | 49a8b8f05cc85693a05dede399f4dfa5a829b718 (diff) | |
2004-10-05 Pierre Humblet <pierre.humblet@ieee.org>
* external.cc (check_ntsec): Do not call wincap.has_security.
* path.cc (path_conv::check): Ditto.
* security.cc (get_object_attribute): Ditto.
(get_file_attribute): Ditto.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/external.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/security.cc | 4 |
4 files changed, 12 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7aa27ee79..ac3b8ac55 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2004-10-05 Pierre Humblet <pierre.humblet@ieee.org> + + * external.cc (check_ntsec): Do not call wincap.has_security. + * path.cc (path_conv::check): Ditto. + * security.cc (get_object_attribute): Ditto. + (get_file_attribute): Ditto. + 2004-10-05 Bas van Gompel <cygwin-patch.buzz@bavag.tmfweb.nl> * pinfo.cc (_pinfo::commune_send): Correct debugging output. diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc index c6694fa93..c0cad365f 100644 --- a/winsup/cygwin/external.cc +++ b/winsup/cygwin/external.cc @@ -125,9 +125,9 @@ static DWORD check_ntsec (const char *filename) { if (!filename) - return wincap.has_security () && allow_ntsec; + return allow_ntsec; path_conv pc (filename); - return wincap.has_security () && allow_ntsec && pc.has_acls (); + return allow_ntsec && pc.has_acls (); } extern "C" unsigned long diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 3bd8d9834..22818839a 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -840,7 +840,7 @@ out: if (fs.update (path)) { debug_printf ("this->path(%s), has_acls(%d)", path, fs.has_acls ()); - if (fs.has_acls () && allow_ntsec && wincap.has_security ()) + if (fs.has_acls () && allow_ntsec) 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. */ diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index 73619aa9c..458e2323a 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -1382,7 +1382,7 @@ int get_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type, mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret) { - if (allow_ntsec && wincap.has_security ()) + if (allow_ntsec) { get_nt_object_attribute (handle, object_type, attribute, uidret, gidret); return 0; @@ -1398,7 +1398,7 @@ get_file_attribute (int use_ntsec, HANDLE handle, const char *file, int res; syscall_printf ("file: %s", file); - if (use_ntsec && allow_ntsec && wincap.has_security ()) + if (use_ntsec && allow_ntsec) { if (!handle || get_nt_object_attribute (handle, SE_FILE_OBJECT, attribute, uidret, gidret)) |