svn commit: samba r23841 - in branches: SAMBA_3_2/source/lib SAMBA_3_2_0/source/lib

[gd at samba.org]

Author: gd
Date: 2007-07-11 15:23:51 +0000 (Wed, 11 Jul 2007)
New Revision: 23841

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23841

Log:
Show all acl types when displaying a security descriptor.

Guenther

Modified:
   branches/SAMBA_3_2/source/lib/display_sec.c
   branches/SAMBA_3_2_0/source/lib/display_sec.c


Changeset:
Modified: branches/SAMBA_3_2/source/lib/display_sec.c
===================================================================
--- branches/SAMBA_3_2/source/lib/display_sec.c	2007-07-11 14:35:48 UTC (rev 23840)
+++ branches/SAMBA_3_2/source/lib/display_sec.c	2007-07-11 15:23:51 UTC (rev 23841)
@@ -135,13 +135,20 @@
 		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 ");
 	

Modified: branches/SAMBA_3_2_0/source/lib/display_sec.c
===================================================================
--- branches/SAMBA_3_2_0/source/lib/display_sec.c	2007-07-11 14:35:48 UTC (rev 23840)
+++ branches/SAMBA_3_2_0/source/lib/display_sec.c	2007-07-11 15:23:51 UTC (rev 23841)
@@ -135,13 +135,20 @@
 		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 ");