From a8936da0e90fad3efc173f4ac2a4fcf384ade43a Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 26 Jun 2008 12:07:07 +0200 Subject: drsuapi: rerun make idl and add drsblobs generated files. Guenther (This used to be commit 6725b751d88b4bacac5171efe4f5193bc1125f19) --- source3/librpc/gen_ndr/drsblobs.h | 388 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 388 insertions(+) create mode 100644 source3/librpc/gen_ndr/drsblobs.h (limited to 'source3/librpc/gen_ndr/drsblobs.h') diff --git a/source3/librpc/gen_ndr/drsblobs.h b/source3/librpc/gen_ndr/drsblobs.h new file mode 100644 index 0000000000..e6df05f641 --- /dev/null +++ b/source3/librpc/gen_ndr/drsblobs.h @@ -0,0 +1,388 @@ +/* header auto-generated by pidl */ + +#include + +#include "librpc/gen_ndr/drsuapi.h" +#include "librpc/gen_ndr/misc.h" +#ifndef _HEADER_drsblobs +#define _HEADER_drsblobs + +#define SUPPLEMENTAL_CREDENTIALS_PREFIX ( " P" ) +enum drsuapi_DsAttributeId; + +struct replPropertyMetaData1 { + enum drsuapi_DsAttributeId attid; + uint32_t version; + NTTIME originating_change_time; + struct GUID originating_invocation_id; + uint64_t originating_usn; + uint64_t local_usn; +}; + +struct replPropertyMetaDataCtr1 { + uint32_t count; + uint32_t reserved; + struct replPropertyMetaData1 *array; +}; + +union replPropertyMetaDataCtr { + struct replPropertyMetaDataCtr1 ctr1;/* [case] */ +}/* [nodiscriminant] */; + +struct replPropertyMetaDataBlob { + uint32_t version; + uint32_t reserved; + union replPropertyMetaDataCtr ctr;/* [switch_is(version)] */ +}/* [public] */; + +struct replUpToDateVectorCtr1 { + uint32_t count; + uint32_t reserved; + struct drsuapi_DsReplicaCursor *cursors; +}; + +struct replUpToDateVectorCtr2 { + uint32_t count; + uint32_t reserved; + struct drsuapi_DsReplicaCursor2 *cursors; +}; + +union replUpToDateVectorCtr { + struct replUpToDateVectorCtr1 ctr1;/* [case] */ + struct replUpToDateVectorCtr2 ctr2;/* [case(2)] */ +}/* [nodiscriminant] */; + +struct replUpToDateVectorBlob { + uint32_t version; + uint32_t reserved; + union replUpToDateVectorCtr ctr;/* [switch_is(version)] */ +}/* [public] */; + +struct repsFromTo1OtherInfo { + uint32_t __dns_name_size;/* [value(strlen(dns_name)+1)] */ + const char *dns_name;/* [charset(DOS)] */ +}/* [gensize,public] */; + +struct repsFromTo1 { + uint32_t blobsize;/* [value(ndr_size_repsFromTo1(this,ndr->flags)+8)] */ + uint32_t consecutive_sync_failures; + NTTIME last_success; + NTTIME last_attempt; + WERROR result_last_attempt; + struct repsFromTo1OtherInfo *other_info;/* [relative] */ + uint32_t other_info_length;/* [value(ndr_size_repsFromTo1OtherInfo(other_info,ndr->flags))] */ + uint32_t replica_flags; + uint8_t schedule[84]; + uint32_t reserved; + struct drsuapi_DsReplicaHighWaterMark highwatermark; + struct GUID source_dsa_obj_guid; + struct GUID source_dsa_invocation_id; + struct GUID transport_guid; +}/* [gensize,public,flag(LIBNDR_PRINT_ARRAY_HEX)] */; + +union repsFromTo { + struct repsFromTo1 ctr1;/* [case] */ +}/* [nodiscriminant] */; + +struct repsFromToBlob { + uint32_t version; + uint32_t reserved; + union repsFromTo ctr;/* [switch_is(version)] */ +}/* [public] */; + +struct partialAttributeSetCtr1 { + uint32_t count; + enum drsuapi_DsAttributeId *array; +}; + +union partialAttributeSetCtr { + struct partialAttributeSetCtr1 ctr1;/* [case] */ +}/* [nodiscriminant] */; + +struct partialAttributeSetBlob { + uint32_t version; + uint32_t reserved; + union partialAttributeSetCtr ctr;/* [switch_is(version)] */ +}/* [public] */; + +enum prefixMapVersion +#ifndef USE_UINT_ENUMS + { + PREFIX_MAP_VERSION_DSDB=0x44534442 +} +#else + { __donnot_use_enum_prefixMapVersion=0x7FFFFFFF} +#define PREFIX_MAP_VERSION_DSDB ( 0x44534442 ) +#endif +; + +union prefixMapCtr { + struct drsuapi_DsReplicaOIDMapping_Ctr dsdb;/* [case(PREFIX_MAP_VERSION_DSDB)] */ +}/* [nodiscriminant] */; + +struct prefixMapBlob { + enum prefixMapVersion version; + uint32_t reserved; + union prefixMapCtr ctr;/* [switch_is(version)] */ +}/* [public] */; + +union ldapControlDirSyncExtra { + struct replUpToDateVectorBlob uptodateness_vector;/* [default] */ +}/* [gensize,nodiscriminant] */; + +struct ldapControlDirSyncBlob { + uint32_t u1;/* [value(3)] */ + NTTIME time; + uint32_t u2; + uint32_t u3; + uint32_t extra_length;/* [value(ndr_size_ldapControlDirSyncExtra(&extra,extra.uptodateness_vector.version,0))] */ + struct drsuapi_DsReplicaHighWaterMark highwatermark; + struct GUID guid1; + union ldapControlDirSyncExtra extra;/* [switch_is(extra_length)] */ +}; + +struct ldapControlDirSyncCookie { + const char *msds;/* [value("MSDS"),charset(DOS)] */ + struct ldapControlDirSyncBlob blob;/* [subcontext(0)] */ +}/* [relative_base,public] */; + +struct supplementalCredentialsPackage { + uint16_t name_len;/* [value(2*strlen_m(name))] */ + uint16_t data_len;/* [value(strlen(data))] */ + uint16_t unknown1; + const char *name;/* [charset(UTF16)] */ + const char *data;/* [charset(DOS)] */ +}; + +struct supplementalCredentialsSubBlob { + const char *prefix;/* [value(SUPPLEMENTAL_CREDENTIALS_PREFIX),charset(UTF16)] */ + uint16_t num_packages; + struct supplementalCredentialsPackage *packages; +}/* [gensize] */; + +struct supplementalCredentialsBlob { + uint32_t unknown1;/* [value(0)] */ + uint32_t __ndr_size;/* [value(ndr_size_supplementalCredentialsSubBlob(&sub,ndr->flags))] */ + uint32_t unknown2;/* [value(0)] */ + struct supplementalCredentialsSubBlob sub;/* [subcontext_size(__ndr_size),subcontext(0)] */ + uint8_t unknown3;/* [value(0)] */ +}/* [public] */; + +struct package_PackagesBlob { + const char ** names;/* [flag(LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */ +}/* [public] */; + +struct package_PrimaryKerberosString { + uint16_t length;/* [value(2*strlen_m(string))] */ + uint16_t size;/* [value(2*strlen_m(string))] */ + const char * string;/* [relative,subcontext_size(size),subcontext(0),flag(LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */ +}; + +struct package_PrimaryKerberosKey { + uint32_t keytype; + uint32_t value_len;/* [value((value?value->length:0))] */ + DATA_BLOB *value;/* [relative,subcontext_size(value_len),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */ + uint32_t unknown1;/* [value(0)] */ + uint32_t unknown2;/* [value(0)] */ +}; + +struct package_PrimaryKerberosCtr3 { + uint16_t num_keys; + uint16_t num_old_keys; + struct package_PrimaryKerberosString salt; + uint32_t unknown1;/* [value(0)] */ + uint32_t unknown2;/* [value(0)] */ + struct package_PrimaryKerberosKey *keys; + struct package_PrimaryKerberosKey *old_keys; + uint64_t *unknown3; + uint64_t *unknown3_old; +}; + +union package_PrimaryKerberosCtr { + struct package_PrimaryKerberosCtr3 ctr3;/* [case(3)] */ +}/* [nodiscriminant] */; + +struct package_PrimaryKerberosBlob { + uint32_t version;/* [value(3)] */ + union package_PrimaryKerberosCtr ctr;/* [switch_is(version)] */ +}/* [public] */; + +struct package_PrimaryCLEARTEXTBlob { + const char * cleartext;/* [flag(LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */ +}/* [public] */; + +struct package_PrimaryWDigestHash { + uint8_t hash[16]; +}/* [flag(LIBNDR_PRINT_ARRAY_HEX)] */; + +struct package_PrimaryWDigestBlob { + uint16_t unknown1;/* [value(0x31)] */ + uint8_t unknown2;/* [value(0x01)] */ + uint8_t num_hashes; + uint32_t unknown3;/* [value(0)] */ + uint64_t uuknown4;/* [value(0)] */ + struct package_PrimaryWDigestHash *hashes; +}/* [public] */; + +struct trustAuthInOutSecret1 { + NTTIME time1; + uint32_t unknown1; + DATA_BLOB value; + DATA_BLOB _pad;/* [flag(LIBNDR_FLAG_ALIGN4)] */ +}; + +struct trustAuthInOutCtr1 { + struct trustAuthInOutSecret1 *value1;/* [relative] */ + struct trustAuthInOutSecret1 *value2;/* [relative] */ +}; + +struct trustAuthInOutSecret2V1 { + NTTIME time1; + uint32_t unknown1; + DATA_BLOB value; + NTTIME time2; + uint32_t unknown2; + uint32_t unknown3; + uint32_t unknown4; + DATA_BLOB _pad;/* [flag(LIBNDR_FLAG_ALIGN4)] */ +}; + +struct trustAuthInOutSecret2V2 { + NTTIME time1; + uint32_t unknown1; + DATA_BLOB value; + NTTIME time2; + uint32_t unknown2; + uint32_t unknown3; + DATA_BLOB _pad;/* [flag(LIBNDR_FLAG_ALIGN4)] */ +}; + +struct trustAuthInOutCtr2 { + struct trustAuthInOutSecret2V1 *value1;/* [relative] */ + struct trustAuthInOutSecret2V2 *value2;/* [relative] */ +}; + +union trustAuthInOutCtr { + struct trustAuthInOutCtr1 ctr1;/* [case] */ + struct trustAuthInOutCtr2 ctr2;/* [case(2)] */ +}/* [nodiscriminant] */; + +struct trustAuthInOutBlob { + uint32_t version; + union trustAuthInOutCtr ctr;/* [switch_is(version)] */ +}/* [public] */; + +struct DsCompressedChunk { + uint32_t marker; + DATA_BLOB data; +}/* [public] */; + +struct DsCompressedBlob { + struct DsCompressedChunk chunks[5]; +}/* [public] */; + + +struct decode_replPropertyMetaData { + struct { + struct replPropertyMetaDataBlob blob; + } in; + +}; + + +struct decode_replUpToDateVector { + struct { + struct replUpToDateVectorBlob blob; + } in; + +}; + + +struct decode_repsFromTo { + struct { + struct repsFromToBlob blob; + } in; + +}; + + +struct decode_partialAttributeSet { + struct { + struct partialAttributeSetBlob blob; + } in; + +}; + + +struct decode_prefixMap { + struct { + struct prefixMapBlob blob; + } in; + +}; + + +struct decode_ldapControlDirSync { + struct { + struct ldapControlDirSyncCookie cookie; + } in; + +}; + + +struct decode_supplementalCredentials { + struct { + struct supplementalCredentialsBlob blob; + } in; + +}; + + +struct decode_Packages { + struct { + struct package_PackagesBlob blob; + } in; + +}; + + +struct decode_PrimaryKerberos { + struct { + struct package_PrimaryKerberosBlob blob; + } in; + +}; + + +struct decode_PrimaryCLEARTEXT { + struct { + struct package_PrimaryCLEARTEXTBlob blob; + } in; + +}; + + +struct decode_PrimaryWDigest { + struct { + struct package_PrimaryWDigestBlob blob; + } in; + +}; + + +struct decode_trustAuthInOut { + struct { + struct trustAuthInOutBlob blob; + } in; + +}; + + +struct decode_DsCompressed { + struct { + struct DsCompressedBlob blob; + } in; + +}; + +#endif /* _HEADER_drsblobs */ -- cgit From 66bb6ac2eac1531dbb68e6350b4d53ec4ee6ca59 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 23 Jul 2008 22:42:18 +0200 Subject: re-run "make idl" after changing unknown1->reserved in drsblobs.idl Michael (This used to be commit 398702a818a0c292ab5b4f76be95168de83ffa25) --- source3/librpc/gen_ndr/drsblobs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/librpc/gen_ndr/drsblobs.h') diff --git a/source3/librpc/gen_ndr/drsblobs.h b/source3/librpc/gen_ndr/drsblobs.h index e6df05f641..7ce4d11ede 100644 --- a/source3/librpc/gen_ndr/drsblobs.h +++ b/source3/librpc/gen_ndr/drsblobs.h @@ -149,7 +149,7 @@ struct ldapControlDirSyncCookie { struct supplementalCredentialsPackage { uint16_t name_len;/* [value(2*strlen_m(name))] */ uint16_t data_len;/* [value(strlen(data))] */ - uint16_t unknown1; + uint16_t reserved; const char *name;/* [charset(UTF16)] */ const char *data;/* [charset(DOS)] */ }; -- cgit From 4c3aa3056ca53a3ee70978bcee011f50f66c44d5 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 23 Jul 2008 23:02:09 +0200 Subject: re-run "make idl" after fixing idl for supplementalCredentialsSubBlob. Michael (This used to be commit e33af40ad41816531c3189ef146f192a902d3229) --- source3/librpc/gen_ndr/drsblobs.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'source3/librpc/gen_ndr/drsblobs.h') diff --git a/source3/librpc/gen_ndr/drsblobs.h b/source3/librpc/gen_ndr/drsblobs.h index 7ce4d11ede..c2f828a1e1 100644 --- a/source3/librpc/gen_ndr/drsblobs.h +++ b/source3/librpc/gen_ndr/drsblobs.h @@ -7,7 +7,7 @@ #ifndef _HEADER_drsblobs #define _HEADER_drsblobs -#define SUPPLEMENTAL_CREDENTIALS_PREFIX ( " P" ) +#define SUPPLEMENTAL_CREDENTIALS_PREFIX ( " " ) enum drsuapi_DsAttributeId; struct replPropertyMetaData1 { @@ -154,8 +154,20 @@ struct supplementalCredentialsPackage { const char *data;/* [charset(DOS)] */ }; +enum supplementalCredentialsSignature +#ifndef USE_UINT_ENUMS + { + SUPPLEMENTAL_CREDENTIALS_SIGNATURE=0x0050 +} +#else + { __donnot_use_enum_supplementalCredentialsSignature=0x7FFFFFFF} +#define SUPPLEMENTAL_CREDENTIALS_SIGNATURE ( 0x0050 ) +#endif +; + struct supplementalCredentialsSubBlob { const char *prefix;/* [value(SUPPLEMENTAL_CREDENTIALS_PREFIX),charset(UTF16)] */ + enum supplementalCredentialsSignature signature;/* [value(SUPPLEMENTAL_CREDENTIALS_SIGNATURE)] */ uint16_t num_packages; struct supplementalCredentialsPackage *packages; }/* [gensize] */; -- cgit From 6b7134e2d3af3d6df942fe50818dfb47fb873214 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 23 Jul 2008 23:06:30 +0200 Subject: re-run "make idl" after fixing unknowns in package_PrimaryKerberos (drsblobs.idl) Michael (This used to be commit a5de166833631dbc8450277d180c69086deacd4b) --- source3/librpc/gen_ndr/drsblobs.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'source3/librpc/gen_ndr/drsblobs.h') diff --git a/source3/librpc/gen_ndr/drsblobs.h b/source3/librpc/gen_ndr/drsblobs.h index c2f828a1e1..da8567ec16 100644 --- a/source3/librpc/gen_ndr/drsblobs.h +++ b/source3/librpc/gen_ndr/drsblobs.h @@ -191,23 +191,25 @@ struct package_PrimaryKerberosString { }; struct package_PrimaryKerberosKey { + uint16_t reserved1;/* [value(0)] */ + uint16_t reserved2;/* [value(0)] */ + uint32_t reserved3;/* [value(0)] */ uint32_t keytype; uint32_t value_len;/* [value((value?value->length:0))] */ DATA_BLOB *value;/* [relative,subcontext_size(value_len),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */ - uint32_t unknown1;/* [value(0)] */ - uint32_t unknown2;/* [value(0)] */ }; struct package_PrimaryKerberosCtr3 { uint16_t num_keys; uint16_t num_old_keys; struct package_PrimaryKerberosString salt; - uint32_t unknown1;/* [value(0)] */ - uint32_t unknown2;/* [value(0)] */ struct package_PrimaryKerberosKey *keys; struct package_PrimaryKerberosKey *old_keys; - uint64_t *unknown3; - uint64_t *unknown3_old; + uint32_t padding1;/* [value(0)] */ + uint32_t padding2;/* [value(0)] */ + uint32_t padding3;/* [value(0)] */ + uint32_t padding4;/* [value(0)] */ + uint32_t padding5;/* [value(0)] */ }; union package_PrimaryKerberosCtr { -- cgit From 24d748cf34598ad2f6e6e2118dccd54c6048db2e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 23 Jul 2008 23:10:34 +0200 Subject: re-run "make idl" after adding idl for idl for Primary:Kerberos-Newer-Keys Michael (This used to be commit d78667c88515aa4fffc49b44c00f470f7d25bd4d) --- source3/librpc/gen_ndr/drsblobs.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'source3/librpc/gen_ndr/drsblobs.h') diff --git a/source3/librpc/gen_ndr/drsblobs.h b/source3/librpc/gen_ndr/drsblobs.h index da8567ec16..c0db9e9552 100644 --- a/source3/librpc/gen_ndr/drsblobs.h +++ b/source3/librpc/gen_ndr/drsblobs.h @@ -221,6 +221,36 @@ struct package_PrimaryKerberosBlob { union package_PrimaryKerberosCtr ctr;/* [switch_is(version)] */ }/* [public] */; +struct package_PrimaryKerberosNewerKey { + uint32_t unknown1;/* [value(0)] */ + uint32_t unknown2;/* [value(0)] */ + uint32_t unknown3;/* [value(0x00001000)] */ + uint32_t keytype; + uint32_t value_len;/* [value((value?value->length:0))] */ + DATA_BLOB *value;/* [relative,subcontext_size(value_len),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */ +}; + +struct package_PrimaryKerberosNewerCtr4 { + uint16_t num_keys; + uint16_t unknown1;/* [value(0)] */ + uint16_t num_old_keys1; + uint16_t num_old_keys2; + struct package_PrimaryKerberosString salt; + uint32_t unknown2;/* [value(0x00001000)] */ + struct package_PrimaryKerberosNewerKey *keys; + struct package_PrimaryKerberosNewerKey *old_keys1; + struct package_PrimaryKerberosNewerKey *old_keys2; +}; + +union package_PrimaryKerberosNewerCtr { + struct package_PrimaryKerberosNewerCtr4 ctr4;/* [case(4)] */ +}/* [nodiscriminant] */; + +struct package_PrimaryKerberosNewerBlob { + uint32_t version;/* [value(4)] */ + union package_PrimaryKerberosNewerCtr ctr;/* [switch_is(version)] */ +}/* [public] */; + struct package_PrimaryCLEARTEXTBlob { const char * cleartext;/* [flag(LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */ }/* [public] */; @@ -368,6 +398,14 @@ struct decode_PrimaryKerberos { }; +struct decode_PrimaryKerberosNewer { + struct { + struct package_PrimaryKerberosNewerBlob blob; + } in; + +}; + + struct decode_PrimaryCLEARTEXT { struct { struct package_PrimaryCLEARTEXTBlob blob; -- cgit From 1ff0633e05891ab0218267aae2f4fcbfd2512b9f Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 28 Jul 2008 14:15:27 +0200 Subject: run "make idl" after idl change "give some unknowns a meaning" (67de745) Michael (This used to be commit e5d95c4f41c2fe25920b0b707f637a562cb23ed8) --- source3/librpc/gen_ndr/drsblobs.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'source3/librpc/gen_ndr/drsblobs.h') diff --git a/source3/librpc/gen_ndr/drsblobs.h b/source3/librpc/gen_ndr/drsblobs.h index c0db9e9552..dec17bf09c 100644 --- a/source3/librpc/gen_ndr/drsblobs.h +++ b/source3/librpc/gen_ndr/drsblobs.h @@ -222,9 +222,10 @@ struct package_PrimaryKerberosBlob { }/* [public] */; struct package_PrimaryKerberosNewerKey { - uint32_t unknown1;/* [value(0)] */ - uint32_t unknown2;/* [value(0)] */ - uint32_t unknown3;/* [value(0x00001000)] */ + uint16_t reserved1;/* [value(0)] */ + uint16_t reserved2;/* [value(0)] */ + uint32_t reserved3;/* [value(0)] */ + uint32_t iteration_count; uint32_t keytype; uint32_t value_len;/* [value((value?value->length:0))] */ DATA_BLOB *value;/* [relative,subcontext_size(value_len),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */ @@ -232,14 +233,15 @@ struct package_PrimaryKerberosNewerKey { struct package_PrimaryKerberosNewerCtr4 { uint16_t num_keys; - uint16_t unknown1;/* [value(0)] */ - uint16_t num_old_keys1; - uint16_t num_old_keys2; + uint16_t num_service_keys;/* [value(0)] */ + uint16_t num_old_keys; + uint16_t num_older_keys; struct package_PrimaryKerberosString salt; - uint32_t unknown2;/* [value(0x00001000)] */ + uint32_t default_iteration_count; struct package_PrimaryKerberosNewerKey *keys; - struct package_PrimaryKerberosNewerKey *old_keys1; - struct package_PrimaryKerberosNewerKey *old_keys2; + struct package_PrimaryKerberosNewerKey *service_keys; + struct package_PrimaryKerberosNewerKey *old_keys; + struct package_PrimaryKerberosNewerKey *older_keys; }; union package_PrimaryKerberosNewerCtr { -- cgit From d6b7f800d3d6ce6c9336498d7ec9b825c28b6c42 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 28 Jul 2008 14:17:11 +0200 Subject: run "make idl" after idl change to unify Primary:Kerberos* structs (e8ae49f) Michael (This used to be commit 6dd1582e3583ed3c0766db552a368ddb30af5f7d) --- source3/librpc/gen_ndr/drsblobs.h | 47 +++++++++++++-------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) (limited to 'source3/librpc/gen_ndr/drsblobs.h') diff --git a/source3/librpc/gen_ndr/drsblobs.h b/source3/librpc/gen_ndr/drsblobs.h index dec17bf09c..b0ab9aea2a 100644 --- a/source3/librpc/gen_ndr/drsblobs.h +++ b/source3/librpc/gen_ndr/drsblobs.h @@ -190,7 +190,7 @@ struct package_PrimaryKerberosString { const char * string;/* [relative,subcontext_size(size),subcontext(0),flag(LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING)] */ }; -struct package_PrimaryKerberosKey { +struct package_PrimaryKerberosKey3 { uint16_t reserved1;/* [value(0)] */ uint16_t reserved2;/* [value(0)] */ uint32_t reserved3;/* [value(0)] */ @@ -203,8 +203,8 @@ struct package_PrimaryKerberosCtr3 { uint16_t num_keys; uint16_t num_old_keys; struct package_PrimaryKerberosString salt; - struct package_PrimaryKerberosKey *keys; - struct package_PrimaryKerberosKey *old_keys; + struct package_PrimaryKerberosKey3 *keys; + struct package_PrimaryKerberosKey3 *old_keys; uint32_t padding1;/* [value(0)] */ uint32_t padding2;/* [value(0)] */ uint32_t padding3;/* [value(0)] */ @@ -212,16 +212,7 @@ struct package_PrimaryKerberosCtr3 { uint32_t padding5;/* [value(0)] */ }; -union package_PrimaryKerberosCtr { - struct package_PrimaryKerberosCtr3 ctr3;/* [case(3)] */ -}/* [nodiscriminant] */; - -struct package_PrimaryKerberosBlob { - uint32_t version;/* [value(3)] */ - union package_PrimaryKerberosCtr ctr;/* [switch_is(version)] */ -}/* [public] */; - -struct package_PrimaryKerberosNewerKey { +struct package_PrimaryKerberosKey4 { uint16_t reserved1;/* [value(0)] */ uint16_t reserved2;/* [value(0)] */ uint32_t reserved3;/* [value(0)] */ @@ -231,26 +222,28 @@ struct package_PrimaryKerberosNewerKey { DATA_BLOB *value;/* [relative,subcontext_size(value_len),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */ }; -struct package_PrimaryKerberosNewerCtr4 { +struct package_PrimaryKerberosCtr4 { uint16_t num_keys; uint16_t num_service_keys;/* [value(0)] */ uint16_t num_old_keys; uint16_t num_older_keys; struct package_PrimaryKerberosString salt; uint32_t default_iteration_count; - struct package_PrimaryKerberosNewerKey *keys; - struct package_PrimaryKerberosNewerKey *service_keys; - struct package_PrimaryKerberosNewerKey *old_keys; - struct package_PrimaryKerberosNewerKey *older_keys; + struct package_PrimaryKerberosKey4 *keys; + struct package_PrimaryKerberosKey4 *service_keys; + struct package_PrimaryKerberosKey4 *old_keys; + struct package_PrimaryKerberosKey4 *older_keys; }; -union package_PrimaryKerberosNewerCtr { - struct package_PrimaryKerberosNewerCtr4 ctr4;/* [case(4)] */ +union package_PrimaryKerberosCtr { + struct package_PrimaryKerberosCtr3 ctr3;/* [case(3)] */ + struct package_PrimaryKerberosCtr4 ctr4;/* [case(4)] */ }/* [nodiscriminant] */; -struct package_PrimaryKerberosNewerBlob { - uint32_t version;/* [value(4)] */ - union package_PrimaryKerberosNewerCtr ctr;/* [switch_is(version)] */ +struct package_PrimaryKerberosBlob { + uint16_t version; + uint16_t flags;/* [value(0)] */ + union package_PrimaryKerberosCtr ctr;/* [switch_is(version)] */ }/* [public] */; struct package_PrimaryCLEARTEXTBlob { @@ -400,14 +393,6 @@ struct decode_PrimaryKerberos { }; -struct decode_PrimaryKerberosNewer { - struct { - struct package_PrimaryKerberosNewerBlob blob; - } in; - -}; - - struct decode_PrimaryCLEARTEXT { struct { struct package_PrimaryCLEARTEXTBlob blob; -- cgit