From a653f600f5dd6a6d7ede4b2969659f500804233d Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Wed, 14 Apr 2004 20:16:29 +0000
Subject: 	* sec_acl.cc (getacl): Avoid compiler warning. 	* security.cc
 (write_sd): Ditto.  Fix error handling.

---
 winsup/cygwin/sec_acl.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'winsup/cygwin/sec_acl.cc')

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;
-- 
cgit v1.2.3