r15328: Move some functions around, remove dependencies.

Remove some autogenerated headers (which had prototypes now autogenerated by pidl)
Remove ndr_security.h from a few places - it's no longer necessary
(This used to be commit c19c2b51d3e1ad347120b06a22bda5ec586c22e8)

4 files changed, 19 insertions, 22 deletions

diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index 83ffbb4baa..85a475175a 100644
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -7,8 +7,7 @@
   authservice("ldap"),
   helpstring("Active Directory Replication"),
   pointer_default(unique),
-  depends(security),
-  helper("librpc/ndr/ndr_drsuapi.h")
+  depends(security)
 ] 
 interface drsuapi
 {
@@ -122,7 +121,7 @@ interface drsuapi
 	/* Function 0x02 */
 	typedef [public,gensize] struct {
 		[value(ndr_size_drsuapi_DsReplicaObjectIdentifier(r, ndr->flags)-4)] uint32 __ndr_size;
-		[value(ndr_length_dom_sid(&r->sid))]  uint32 __ndr_size_sid;
+		[value(ndr_size_dom_sid(&r->sid, ndr->flags))]  uint32 __ndr_size_sid;
 		GUID guid;
 		dom_sid28 sid;
 		[flag(STR_SIZE4|STR_CHARLEN|STR_CONFORMANT)] string dn;
@@ -444,7 +443,7 @@ interface drsuapi
 	/* DN String values */
 	typedef [public,gensize] struct {
 		[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, ndr->flags))] uint32 __ndr_size;
-		[value(ndr_length_dom_sid(&r->sid))]  uint32 __ndr_size_sid;
+		[value(ndr_size_dom_sid(&r->sid,ndr->flags))]  uint32 __ndr_size_sid;
 		GUID guid;
 		dom_sid28 sid;
 		[flag(STR_SIZE4|STR_CHARLEN)] string dn;
@@ -473,7 +472,7 @@ interface drsuapi
 
 	/* SID values */
 	typedef struct {
-		[range(0,10485760),value(ndr_size_dom_sid(sid))] uint32 __ndr_size;
+		[range(0,10485760),value(ndr_size_dom_sid(sid,ndr->flags))] uint32 __ndr_size;
 		[subcontext(4)] dom_sid *sid;
 	} drsuapi_DsAttributeValueSID;
 
@@ -484,7 +483,7 @@ interface drsuapi
 
 	/* SecurityDescriptor values */
 	typedef struct {
-		[range(0,10485760),value(ndr_size_security_descriptor(sd))] uint32 __ndr_size;
+		[range(0,10485760),value(ndr_size_security_descriptor(sd,ndr->flags))] uint32 __ndr_size;
 		[subcontext(4)] security_descriptor *sd;
 	} drsuapi_DsAttributeValueSecurityDescriptor;
 
diff --git a/source4/librpc/idl/krb5pac.idl b/source4/librpc/idl/krb5pac.idl
index fff1946025..229ce3402d 100644
--- a/source4/librpc/idl/krb5pac.idl
+++ b/source4/librpc/idl/krb5pac.idl
@@ -9,8 +9,7 @@
   version(0.0),
   pointer_default(unique),
   helpstring("Active Directory KRB5 PAC"),
-  depends(security,netlogon,samr),
-  helper("librpc/ndr/ndr_krb5pac.h")
+  depends(security,netlogon,samr)
 ]
 interface krb5pac
 {
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl
index a948a79ff1..65ae20111e 100644
--- a/source4/librpc/idl/nbt.idl
+++ b/source4/librpc/idl/nbt.idl
@@ -427,7 +427,7 @@
 		nstring          unicode_domain;
 		uint32           db_count;
 		nbt_db_change    dbchange[db_count];
-		[value(ndr_size_dom_sid(&sid))] uint32 sid_size;
+		[value(ndr_size_dom_sid(&sid, ndr->flags))] uint32 sid_size;
 		[flag(NDR_ALIGN4)] DATA_BLOB _pad2;
 		dom_sid          sid;
 		uint32           nt_version;
@@ -547,7 +547,7 @@
 		nstring              user_name;
 		astring              mailslot_name;
 		uint32               acct_control;
-		[value(ndr_size_dom_sid(&sid))] uint32 sid_size;
+		[value(ndr_size_dom_sid(&sid, ndr->flags))] uint32 sid_size;
 		[flag(NDR_ALIGN4)]   DATA_BLOB _pad;
 		dom_sid              sid;
 		uint32               nt_version;
diff --git a/source4/librpc/idl/security.idl b/source4/librpc/idl/security.idl
index f22e6b6836..c756a1a6d0 100644
--- a/source4/librpc/idl/security.idl
+++ b/source4/librpc/idl/security.idl
@@ -6,8 +6,7 @@
 
 [
 	pointer_default(unique),
-	depends(misc),
-	helper("librpc/ndr/ndr_sec.h")
+	depends(misc,security)
 ]
 interface security
 {
@@ -22,9 +21,9 @@ interface security
 		   
           common combinations of bits are prefixed with SEC_RIGHTS_
 	*/
-        const int SEC_MASK_GENERIC         = 0xF0000000;
-        const int SEC_MASK_FLAGS           = 0x0F000000;
-        const int SEC_MASK_STANDARD        = 0x00FF0000;
+    const int SEC_MASK_GENERIC         = 0xF0000000;
+    const int SEC_MASK_FLAGS           = 0x0F000000;
+    const int SEC_MASK_STANDARD        = 0x00FF0000;
 	const int SEC_MASK_SPECIFIC        = 0x0000FFFF;
 
 	/* generic bits */
@@ -210,7 +209,7 @@ interface security
 
 	/* a domain SID. Note that unlike Samba3 this contains a pointer,
 	   so you can't copy them using assignment */
-	typedef [public,noprint,noejs] struct {
+	typedef [public,gensize,noprint,noejs,nosize] struct {
 		uint8  sid_rev_num;             /**< SID revision number */
 		[range(0,15)] int8  num_auths;  /**< Number of sub-authorities */
 		uint8  id_auth[6];              /**< Identifier Authority */
@@ -273,10 +272,10 @@ interface security
 		[default];
 	} security_ace_object_ctr;
 
-	typedef [public] struct {
+	typedef [public,gensize,nosize] struct {
 		security_ace_type type;  /* SEC_ACE_TYPE_* */
 		security_ace_flags flags; /* SEC_ACE_FLAG_* */
-		[value(ndr_size_security_ace(r))] uint16 size;
+		[value(ndr_size_security_ace(r,ndr->flags))] uint16 size;
 		uint32 access_mask;
 		[switch_is(type)] security_ace_object_ctr object;
 		dom_sid trustee;
@@ -289,9 +288,9 @@ interface security
 
 	const uint NT4_ACL_REVISION	= SECURITY_ACL_REVISION_NT4;
 
-	typedef [public] struct {
+	typedef [public,gensize,nosize] struct {
 		security_acl_revision revision;
-		[value(ndr_size_security_acl(r))] uint16 size;
+		[value(ndr_size_security_acl(r,ndr->flags))] uint16 size;
 		[range(0,1000)] uint32 num_aces;
 		security_ace aces[num_aces];
 	} security_acl;
@@ -323,7 +322,7 @@ interface security
 		SEC_DESC_SELF_RELATIVE		= 0x8000
 	} security_descriptor_type;
 
-	typedef [public,flag(NDR_LITTLE_ENDIAN)] struct {
+	typedef [gensize,nosize,public,flag(NDR_LITTLE_ENDIAN)] struct {
 		security_descriptor_revision revision;
 		security_descriptor_type type;     /* SEC_DESC_xxxx flags */
 		[relative] dom_sid *owner_sid; 
@@ -333,7 +332,7 @@ interface security
 	} security_descriptor;
 
 	typedef [public] struct {
-		[range(0,0x40000),value(ndr_size_security_descriptor(sd))] uint32 sd_size;
+		[range(0,0x40000),value(ndr_size_security_descriptor(sd,ndr->flags))] uint32 sd_size;
 		[subcontext(4)] security_descriptor *sd;
 	} sec_desc_buf;