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.
This commit is contained in:
Pierre Humblet 2004-10-06 01:33:39 +00:00
parent 49a8b8f05c
commit b0637a5191
4 changed files with 12 additions and 5 deletions

View File

@ -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> 2004-10-05 Bas van Gompel <cygwin-patch.buzz@bavag.tmfweb.nl>
* pinfo.cc (_pinfo::commune_send): Correct debugging output. * pinfo.cc (_pinfo::commune_send): Correct debugging output.

View File

@ -125,9 +125,9 @@ static DWORD
check_ntsec (const char *filename) check_ntsec (const char *filename)
{ {
if (!filename) if (!filename)
return wincap.has_security () && allow_ntsec; return allow_ntsec;
path_conv pc (filename); path_conv pc (filename);
return wincap.has_security () && allow_ntsec && pc.has_acls (); return allow_ntsec && pc.has_acls ();
} }
extern "C" unsigned long extern "C" unsigned long

View File

@ -840,7 +840,7 @@ out:
if (fs.update (path)) if (fs.update (path))
{ {
debug_printf ("this->path(%s), has_acls(%d)", path, fs.has_acls ()); 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 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 but set it to not executable since it will be figured out
later by anything which cares about this. */ later by anything which cares about this. */

View File

@ -1382,7 +1382,7 @@ int
get_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type, get_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type,
mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret) 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); get_nt_object_attribute (handle, object_type, attribute, uidret, gidret);
return 0; return 0;
@ -1398,7 +1398,7 @@ get_file_attribute (int use_ntsec, HANDLE handle, const char *file,
int res; int res;
syscall_printf ("file: %s", file); 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, if (!handle || get_nt_object_attribute (handle, SE_FILE_OBJECT,
attribute, uidret, gidret)) attribute, uidret, gidret))