summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2006-07-18 14:11:38 +0000
committerCorinna Vinschen <corinna@vinschen.de>2006-07-18 14:11:38 +0000
commit62e9d4b96f5bc2aa1aa23361082e01297db32593 (patch)
tree28bb9bc2e6d0d0100a8d7c6e7d0af989ca2bb1f8
parent295912e8734a82a9b11ef7923e880dc0ae00961f (diff)
downloadcygnal-62e9d4b96f5bc2aa1aa23361082e01297db32593.tar.gz
cygnal-62e9d4b96f5bc2aa1aa23361082e01297db32593.tar.bz2
cygnal-62e9d4b96f5bc2aa1aa23361082e01297db32593.zip
* sec_acl.cc (acltotext32): Add missing handling of default ACL entry
types.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/sec_acl.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e3bb5dd8d..a129776a1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-18 Silvio Laguzzi <slaguzzi@data-al.de>
+
+ * sec_acl.cc (acltotext32): Add missing handling of default ACL entry
+ types.
+
2006-07-18 Corinna Vinschen <corinna@vinschen.de>
* fhandler_floppy.cc (fhandler_dev_floppy::ioctl): Fix typo in lint
diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc
index 0c198dc25..85f02013c 100644
--- a/winsup/cygwin/sec_acl.cc
+++ b/winsup/cygwin/sec_acl.cc
@@ -728,7 +728,7 @@ acltotext32 (__aclent32_t *aclbufp, int aclcnt)
first = false;
if (aclbufp[pos].a_type & ACL_DEFAULT)
strcat (buf, "default");
- switch (aclbufp[pos].a_type)
+ switch (aclbufp[pos].a_type & ~ACL_DEFAULT)
{
case USER_OBJ:
__small_sprintf (buf + strlen (buf), "user::%s",