drsblobs.idl: remove nopython from package_PrimaryKerberosBlob related stuff
[metze/samba/wip.git] / librpc / idl / drsblobs.idl
index 97f3b2de0b601b6f0180ae8d140199a0dd372302..064f6ea94b403dab8ad7b62f6c28f932b3329365 100644 (file)
@@ -1,6 +1,6 @@
 #include "idl_types.h"
 
-import "drsuapi.idl", "misc.idl", "samr.idl", "lsa.idl";
+import "drsuapi.idl", "misc.idl", "samr.idl", "lsa.idl", "security.idl";
 
 [
   uuid("12345778-1234-abcd-0001-00000001"),
@@ -10,8 +10,7 @@ import "drsuapi.idl", "misc.idl", "samr.idl", "lsa.idl";
   helpstring("Active Directory Replication LDAP Blobs")
 ]
 interface drsblobs {
-       typedef bitmap drsuapi_DsReplicaSyncOptions drsuapi_DsReplicaSyncOptions;
-       typedef bitmap drsuapi_DsReplicaNeighbourFlags drsuapi_DsReplicaNeighbourFlags;
+       typedef bitmap drsuapi_DrsOptions drsuapi_DrsOptions;
        typedef [v1_enum] enum drsuapi_DsAttributeId drsuapi_DsAttributeId;
        typedef [v1_enum] enum lsa_TrustAuthType lsa_TrustAuthType;
        /*
@@ -93,14 +92,14 @@ interface drsblobs {
 
        typedef [public,gensize,flag(NDR_PAHEX)] struct {
                /* this includes the 8 bytes of the repsFromToBlob header */
-               [value(ndr_size_repsFromTo1(this, ndr->iconv_convenience, ndr->flags)+8)] uint32 blobsize;
+               [value(ndr_size_repsFromTo1(this, ndr->flags)+8)] uint32 blobsize;
                uint32 consecutive_sync_failures;
                NTTIME_1sec last_success;
                NTTIME_1sec last_attempt;
                WERROR result_last_attempt;
                [relative] repsFromTo1OtherInfo *other_info;
-               [value(ndr_size_repsFromTo1OtherInfo(other_info, ndr->iconv_convenience, ndr->flags))] uint32 other_info_length;
-               drsuapi_DsReplicaNeighbourFlags replica_flags;
+               [value(ndr_size_repsFromTo1OtherInfo(other_info, ndr->flags))] uint32 other_info_length;
+               drsuapi_DrsOptions replica_flags;
                uint8 schedule[84];
                [value(0)] uint32 reserved;
                drsuapi_DsReplicaHighWaterMark highwatermark;
@@ -110,7 +109,7 @@ interface drsblobs {
        } repsFromTo1;
 
        typedef [public,relative_base,gensize] struct {
-               [value(ndr_size_repsFromTo2OtherInfo(this,ndr->iconv_convenience, ndr->flags))]
+               [value(ndr_size_repsFromTo2OtherInfo(this,ndr->flags))]
                        uint32 __ndr_size;
                [relative] nstring *dns_name1;
                uint32 unknown1;
@@ -120,14 +119,14 @@ interface drsblobs {
 
        typedef [public,gensize,flag(NDR_PAHEX)] struct {
                /* this includes the 8 bytes of the repsFromToBlob header */
-               [value(ndr_size_repsFromTo2(this, ndr->iconv_convenience, ndr->flags)+8)] uint32 blobsize;
+               [value(ndr_size_repsFromTo2(this, ndr->flags)+8)] uint32 blobsize;
                uint32 consecutive_sync_failures;
                NTTIME_1sec last_success;
                NTTIME_1sec last_attempt;
                WERROR result_last_attempt;
                [relative] repsFromTo2OtherInfo *other_info;
-               [value(ndr_size_repsFromTo2OtherInfo(other_info, ndr->iconv_convenience, ndr->flags))] uint32 other_info_length;
-               drsuapi_DsReplicaNeighbourFlags replica_flags;
+               [value(ndr_size_repsFromTo2OtherInfo(other_info, ndr->flags))] uint32 other_info_length;
+               drsuapi_DrsOptions replica_flags;
                uint8 schedule[84];
                [value(0)] uint32 reserved;
                drsuapi_DsReplicaHighWaterMark highwatermark;
@@ -176,6 +175,44 @@ interface drsblobs {
                [in] partialAttributeSetBlob blob
                );
 
+
+       /*
+        * schemaInfo attribute
+        *
+        * Used as an attribute on Schema.
+        * Also during replication as part of
+        * prefixMap to identify what revision
+        * of Schema source DC has
+        */
+       typedef [public,flag(NDR_NOALIGN)] struct {
+               [value(0xFF)] uint8 marker;
+               [flag(NDR_BIG_ENDIAN)] uint32 revision;
+               GUID   invocation_id;
+       } schemaInfoBlob;
+
+
+       /*
+        * MS w2k3 and w2k8 prefixMap format
+        * There is no version number. Format is:
+        *   uint32 - number of entries in the map
+        *   uint32 - total bytes that structure occupies
+        *   ENTRIES:
+        *     uint16 - prefix ID (OID's last sub-id encoded. see prefixMap)
+        *     uint16 - number of bytes in prefix N
+        *     uint8[N] - BER encoded prefix
+        */
+       typedef [noprint,flag(NDR_NOALIGN)] struct {
+               uint16 entryID;
+               uint16 length;
+               uint8 binary_oid[length];
+       } drsuapi_MSPrefixMap_Entry;
+
+       typedef [public,gensize] struct {
+               uint32 num_entries;
+               [value(ndr_size_drsuapi_MSPrefixMap_Ctr(r, ndr->flags))] uint32 __ndr_size;
+               drsuapi_MSPrefixMap_Entry entries[num_entries];
+       } drsuapi_MSPrefixMap_Ctr;
+
        /*
         * prefixMap
         * w2k  unknown
@@ -218,7 +255,7 @@ interface drsblobs {
                NTTIME time;
                uint32 u2;
                uint32 u3;
-               [value(ndr_size_ldapControlDirSyncExtra(&extra, extra.uptodateness_vector.version, ndr->iconv_convenience, 0))] 
+               [value(ndr_size_ldapControlDirSyncExtra(&extra, extra.uptodateness_vector.version, 0))] 
                        uint32 extra_length;
                drsuapi_DsReplicaHighWaterMark highwatermark;
                GUID guid1;
@@ -279,7 +316,7 @@ interface drsblobs {
 
        typedef [public] struct {
                [value(0)] uint32 unknown1;
-               [value(ndr_size_supplementalCredentialsSubBlob(&sub, ndr->iconv_convenience, ndr->flags))] uint32 __ndr_size;
+               [value(ndr_size_supplementalCredentialsSubBlob(&sub, ndr->flags))] uint32 __ndr_size;
                [value(0)] uint32 unknown2;
                [subcontext(0),subcontext_size(__ndr_size)] supplementalCredentialsSubBlob sub;
                [value(0)] uint8 unknown3;
@@ -431,42 +468,40 @@ interface drsblobs {
        typedef [public] struct {
                NTTIME LastUpdateTime;
                lsa_TrustAuthType AuthType;
-               
                [switch_is(AuthType)] AuthInfo AuthInfo;
                [flag(NDR_ALIGN4)] DATA_BLOB _pad;
        } AuthenticationInformation;
 
-       typedef [nopull,nopush,noprint] struct {
-               /* sizeis here is bogus, but this is here just for the structure */
-               [size_is(1)] AuthenticationInformation array[];
+       /* count is not on the wire */
+       typedef [public,nopull,nopush,gensize] struct {
+               uint32 count;
+               AuthenticationInformation array[count];
        } AuthenticationInformationArray;
 
-       /* This is nopull,nopush because we pass count down to the
-        * manual parser of AuthenticationInformationArray */
-       typedef [public,nopull,nopush,noprint,gensize] struct {
+       /* we cannot use [relative] pointers here because Windows expects the
+        * previous_offset to match the total size of the struct in case
+        * the previous array is empty, see MS-LSAD 2.2.7.16 - gd */
+       typedef [public,gensize,nopush] struct {
                uint32 count;
-               [relative] AuthenticationInformationArray *current;
-               [relative] AuthenticationInformationArray *previous;
+               [value((count > 0) ? 12 : 0)] uint32 current_offset;
+               [value((count > 0) ? 12 + ndr_size_AuthenticationInformationArray(&current, ndr->flags) : 0)] uint32 previous_offset;
+               [subcontext(0),subcontext_size((previous_offset)-(current_offset))] AuthenticationInformationArray current;
+               [subcontext(0)] [flag(NDR_REMAINING)] AuthenticationInformationArray previous;
        } trustAuthInOutBlob;
 
-       void decode_trustAuthInOut(
+       [nopython] void decode_trustAuthInOut(
                [in] trustAuthInOutBlob blob
                );
 
-       typedef [public,gensize] struct {
-               uint32 count;
-               [relative] AuthenticationInformation *current[count];
-       } trustCurrentPasswords;
-
        typedef [public,nopull] struct {
                uint8 confounder[512];
-               [subcontext(0),subcontext_size(outgoing_size)] trustCurrentPasswords outgoing;
-               [subcontext(0),subcontext_size(incoming_size)] trustCurrentPasswords incoming;
-               [value(ndr_size_trustCurrentPasswords(&outgoing, ndr->iconv_convenience, ndr->flags))] uint32 outgoing_size;
-               [value(ndr_size_trustCurrentPasswords(&incoming, ndr->iconv_convenience, ndr->flags))] uint32 incoming_size;
+               [subcontext(0),subcontext_size(outgoing_size)] trustAuthInOutBlob outgoing;
+               [subcontext(0),subcontext_size(incoming_size)] trustAuthInOutBlob incoming;
+               [value(ndr_size_trustAuthInOutBlob(&outgoing, ndr->flags))] uint32 outgoing_size;
+               [value(ndr_size_trustAuthInOutBlob(&incoming, ndr->flags))] uint32 incoming_size;
        } trustDomainPasswords;
 
-       void decode_trustDomainPasswords(
+       [nopython] void decode_trustDomainPasswords(
                [in] trustDomainPasswords blob
                );
 
@@ -547,7 +582,64 @@ interface drsblobs {
                [unique] ExtendedErrorInfo *info;
        } ExtendedErrorInfoPtr;
 
-       void decode_ExtendedErrorInfo (
+       [nopython] void decode_ExtendedErrorInfo (
                [in,subcontext(0xFFFFFC01)] ExtendedErrorInfoPtr ptr
                );
+
+       /* MS-ADTS 7.1.6.9.3 msDS-TrustForestTrustInfo Attribute */
+
+       typedef struct {
+               [value(strlen_m(string))] uint32 size;
+               [charset(UTF8)] uint8 string[size];
+       } ForestTrustString;
+
+       typedef [flag(NDR_NOALIGN)] struct {
+               [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size;
+               [subcontext(0),subcontext_size(sid_size)] dom_sid sid;
+               ForestTrustString dns_name;
+               ForestTrustString netbios_name;
+       } ForestTrustDataDomainInfo;
+
+       typedef [flag(NDR_NOALIGN)] struct {
+               uint32 size;
+               uint8 data[size];
+       } ForestTrustDataBinaryData;
+
+       typedef [nodiscriminant] union {
+               [case(FOREST_TRUST_TOP_LEVEL_NAME)] ForestTrustString name;
+               [case(FOREST_TRUST_TOP_LEVEL_NAME_EX)] ForestTrustString name;
+               [case(FOREST_TRUST_DOMAIN_INFO)] ForestTrustDataDomainInfo info;
+               [default] ForestTrustDataBinaryData data;
+       } ForestTrustData;
+
+       /* same as lsa_ForestTrustRecordType */
+       typedef [enum8bit] enum {
+               FOREST_TRUST_TOP_LEVEL_NAME = 0,
+               FOREST_TRUST_TOP_LEVEL_NAME_EX = 1,
+               FOREST_TRUST_DOMAIN_INFO = 2
+       } ForestTrustInfoRecordType;
+
+       /* meaning of flags depends on record type and values are
+          the same as in lsa.idl, see collision record types */
+       typedef [public,gensize,flag(NDR_NOALIGN)] struct {
+               uint32 flags;
+               NTTIME timestamp;
+               ForestTrustInfoRecordType type;
+               [switch_is(type)] ForestTrustData data;
+       } ForestTrustInfoRecord;
+
+       typedef [flag(NDR_NOALIGN)] struct {
+               [value(ndr_size_ForestTrustInfoRecord(&record, ndr->flags))] uint32 record_size;
+               ForestTrustInfoRecord record;
+       } ForestTrustInfoRecordArmor;
+
+       typedef [public,flag(NDR_NOALIGN)] struct {
+               uint32 version;
+               uint32 count;
+               ForestTrustInfoRecordArmor records[count];
+       } ForestTrustInfo;
+
+       [nopython] void decode_ForestTrustInfo(
+               [in] ForestTrustInfo blob
+               );
 }