summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/sec_acl.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2004-04-14 20:16:29 +0000
committerCorinna Vinschen <corinna@vinschen.de>2004-04-14 20:16:29 +0000
commita653f600f5dd6a6d7ede4b2969659f500804233d (patch)
tree0bbfcc641e8345a453526befdffcfb539f8f3de8 /winsup/cygwin/sec_acl.cc
parent0c5f00f98a5ea0ce297f4002a81166788b4410fc (diff)
downloadcygnal-a653f600f5dd6a6d7ede4b2969659f500804233d.tar.gz
cygnal-a653f600f5dd6a6d7ede4b2969659f500804233d.tar.bz2
cygnal-a653f600f5dd6a6d7ede4b2969659f500804233d.zip
* sec_acl.cc (getacl): Avoid compiler warning.
* security.cc (write_sd): Ditto. Fix error handling.
Diffstat (limited to 'winsup/cygwin/sec_acl.cc')
-rw-r--r--winsup/cygwin/sec_acl.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc
index e5e058983..ed1446e2e 100644
--- a/winsup/cygwin/sec_acl.cc
+++ b/winsup/cygwin/sec_acl.cc
@@ -261,12 +261,11 @@ getacl (HANDLE handle, const char *file, DWORD attr, int nentries,
{
security_descriptor sd;
- int ret;
if (!handle || get_nt_object_security (handle, SE_FILE_OBJECT, sd)
- && (ret = read_sd (file, sd)) <= 0)
+ && read_sd (file, sd) <= 0)
{
debug_printf ("read_sd %E");
- return ret;
+ return -1;
}
cygpsid owner_sid;