From 5d95214cf77aed7ef3c0625fdfaf05154b43c6c0 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 11 Jul 2007 15:23:51 +0000 Subject: r23841: Show all acl types when displaying a security descriptor. Guenther (This used to be commit 06418a63a0bf5df0e0e76172137d5dff026feaa6) --- source3/lib/display_sec.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'source3/lib') 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 "); -- cgit