summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-07-11 15:23:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:28:33 -0500
commit5d95214cf77aed7ef3c0625fdfaf05154b43c6c0 (patch)
tree3b0656a179cfdc88c7287a6123754698af794b5b
parentbdb7c621e66d71d1635fdc7a0956b3eb2faa68eb (diff)
downloadsamba-5d95214cf77aed7ef3c0625fdfaf05154b43c6c0.tar.gz
samba-5d95214cf77aed7ef3c0625fdfaf05154b43c6c0.tar.bz2
samba-5d95214cf77aed7ef3c0625fdfaf05154b43c6c0.zip
r23841: Show all acl types when displaying a security descriptor.
Guenther (This used to be commit 06418a63a0bf5df0e0e76172137d5dff026feaa6)
-rw-r--r--source3/lib/display_sec.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/source3/lib/display_sec.c b/source3/lib/display_sec.c
index b7864bfd06..cb8f151a4e 100644
--- a/source3/lib/display_sec.c
+++ b/source3/lib/display_sec.c
@@ -135,13 +135,20 @@ void display_acl_type(uint16 type)
fstrcat(typestr, "SEC_DESC_DACL_TRUSTED ");
if (type & SEC_DESC_SERVER_SECURITY) /* 0x0080 */
fstrcat(typestr, "SEC_DESC_SERVER_SECURITY ");
- if (type & 0x0100) fstrcat(typestr, "0x0100 ");
- if (type & 0x0200) fstrcat(typestr, "0x0200 ");
- if (type & 0x0400) fstrcat(typestr, "0x0400 ");
- if (type & 0x0800) fstrcat(typestr, "0x0800 ");
- if (type & 0x1000) fstrcat(typestr, "0x1000 ");
- if (type & 0x2000) fstrcat(typestr, "0x2000 ");
- if (type & 0x4000) fstrcat(typestr, "0x4000 ");
+ if (type & SEC_DESC_DACL_AUTO_INHERIT_REQ) /* 0x0100 */
+ fstrcat(typestr, "SEC_DESC_DACL_AUTO_INHERIT_REQ ");
+ if (type & SEC_DESC_SACL_AUTO_INHERIT_REQ) /* 0x0200 */
+ fstrcat(typestr, "SEC_DESC_SACL_AUTO_INHERIT_REQ ");
+ if (type & SEC_DESC_DACL_AUTO_INHERITED) /* 0x0400 */
+ fstrcat(typestr, "SEC_DESC_DACL_AUTO_INHERITED ");
+ if (type & SEC_DESC_SACL_AUTO_INHERITED) /* 0x0800 */
+ fstrcat(typestr, "SEC_DESC_SACL_AUTO_INHERITED ");
+ if (type & SEC_DESC_DACL_PROTECTED) /* 0x1000 */
+ fstrcat(typestr, "SEC_DESC_DACL_PROTECTED ");
+ if (type & SEC_DESC_SACL_PROTECTED) /* 0x2000 */
+ fstrcat(typestr, "SEC_DESC_SACL_PROTECTED ");
+ if (type & SEC_DESC_RM_CONTROL_VALID) /* 0x4000 */
+ fstrcat(typestr, "SEC_DESC_RM_CONTROL_VALID ");
if (type & SEC_DESC_SELF_RELATIVE) /* 0x8000 */
fstrcat(typestr, "SEC_DESC_SELF_RELATIVE ");