security descriptors are no longer a "special" type, they are handled

using the [relative] property

this also fixes level3 of PrinterInfo (a relative secdesc)
(This used to be commit d5a15257fdd5f6cfe2706765a7c29f623ec1c6f8)

1 files changed, 0 insertions, 48 deletions

diff --git a/source4/librpc/ndr/ndr_sec.h b/source4/librpc/ndr/ndr_sec.h
index 60408082e4..27a1311adc 100644
--- a/source4/librpc/ndr/ndr_sec.h
+++ b/source4/librpc/ndr/ndr_sec.h
@@ -22,57 +22,9 @@
 */
 
 
-/* a domain SID. Note that unlike Samba3 this contains a pointer,
-   so you can't copy them using assignment */
-struct dom_sid {
-	uint8  sid_rev_num;             /**< SID revision number */
-	uint8  num_auths;               /**< Number of sub-authorities */
-	uint8  id_auth[6];              /**< Identifier Authority */
-	uint32 *sub_auths;
-};
-
 /* use the same structure for dom_sid2 as dom_sid */
 #define dom_sid2 dom_sid
 
-/* an access control element */
-struct security_ace {
-	uint8 type;  /* xxxx_xxxx_ACE_TYPE - e.g allowed / denied etc */
-	uint8 flags; /* xxxx_INHERIT_xxxx - e.g OBJECT_INHERIT_ACE */
-
-	uint32 access_mask;
-
-	/* the 'obj' part is present when type is XXXX_TYPE_XXXX_OBJECT */
-	struct {
-		uint32 flags;
-		GUID object_guid;
-		GUID inherit_guid;
-	} *obj;
-
-	struct dom_sid trustee;
-};
-
-
-/* a security ACL */
-struct security_acl {
-	uint16 revision;
-	uint32 num_aces;
-
-	struct security_ace *aces;
-};
-
-
-/* a security descriptor */
-struct security_descriptor {
-	uint8 revision;
-	uint16 type;     /* SEC_DESC_xxxx flags */
-
-	struct dom_sid *owner_sid; 
-	struct dom_sid *group_sid;
-	struct security_acl *sacl; /* system ACL */
-	struct security_acl *dacl; /* user (discretionary) ACL */
-};
-
-
 /* query security descriptor */
 struct smb_query_secdesc {
 	struct {