summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2003-04-03 08:18:43 +0000
committerCorinna Vinschen <corinna@vinschen.de>2003-04-03 08:18:43 +0000
commitd5292d66a4988dd92c5f844b4a2874b4e69b9e2b (patch)
treeb27f267d5c8ca9e4db83aaf7d59ca3611833f2de
parent5a4a19b3f31bc966b53377b10accc3e20c1b229c (diff)
downloadcygnal-d5292d66a4988dd92c5f844b4a2874b4e69b9e2b.tar.gz
cygnal-d5292d66a4988dd92c5f844b4a2874b4e69b9e2b.tar.bz2
cygnal-d5292d66a4988dd92c5f844b4a2874b4e69b9e2b.zip
* external.cc (check_ntsec): Return general ntsec state on NULL
filename. Check wincap.is_security() additionally.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/external.cc4
2 files changed, 8 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f2f419bdd..db442d365 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-03 Corinna Vinschen <corinna@vinschen.de>
+
+ * external.cc (check_ntsec): Return general ntsec state on NULL
+ filename. Check wincap.is_security() additionally.
+
2003-04-02 Christopher Faylor <cgf@redhat.com>
* Makefile.in (EXTRA_OFILES): Remove debugging object.
diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
index 6aa7e90bb..3accc6300 100644
--- a/winsup/cygwin/external.cc
+++ b/winsup/cygwin/external.cc
@@ -124,8 +124,10 @@ get_cygdrive_prefixes (char *user, char *system)
static DWORD
check_ntsec (const char *filename)
{
+ if (!filename)
+ return wincap.has_security () && allow_ntsec;
path_conv pc (filename);
- return allow_ntsec && pc.has_acls ();
+ return wincap.has_security () && allow_ntsec && pc.has_acls ();
}
extern "C" unsigned long