svn commit: samba r20799 - in branches/SAMBA_4_0/source/libcli/security: .

[metze at samba.org]

Author: metze
Date: 2007-01-15 10:10:15 +0000 (Mon, 15 Jan 2007)
New Revision: 20799

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

Log:
if any ace has the optional sub object, the acl revision needs
to be SECURITY_ACL_REVISION_ADS (4)

metze
Modified:
   branches/SAMBA_4_0/source/libcli/security/sddl.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/security/sddl.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/security/sddl.c	2007-01-15 09:54:08 UTC (rev 20798)
+++ branches/SAMBA_4_0/source/libcli/security/sddl.c	2007-01-15 10:10:15 UTC (rev 20799)
@@ -312,6 +312,14 @@
 			talloc_free(acl);
 			return NULL;
 		}
+		switch (acl->aces[acl->num_aces].type) {
+		case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
+		case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
+		case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
+		case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
+			acl->revision = SECURITY_ACL_REVISION_ADS;
+			break;
+		}
 		talloc_free(astr);
 		sddl += len+2;
 		acl->num_aces++;