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