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.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7aa27ee798df1306e341214cd8cdbfd3410a7131..ac3b8ac55562e850e2e5d834de203be3bf809385 100644 (file)
--- 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 c6694fa93daa64a5348e9f50b83b84fa7d1d6e11..c0cad365f793b7c5490457012ff3b88c519234f7 100644 (file)
--- 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 3bd8d98347894bc1dd2e8574765bddcbde17f31e..22818839a423c15e0f3b3f601f620eb61725424d 100644 (file)
--- 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 73619aa9cdca7e32dac0c7341f62d4381080bbe1..458e2323a4223532c87ad758574a4ac1a0710318 100644 (file)
--- 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))