diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-07-24 08:20:06 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-07-24 08:24:09 +0200 |
| commit | 8a86e3cb4515ffe66bf833aea2b05f2d2b603800 (patch) | |
| tree | 801956ce139a7b74917e165ec582ec272ebba88e /source4 | |
| parent | aaa29d2fa534f992aadbddad4232422a8ac28d74 (diff) | |
| download | samba-8a86e3cb4515ffe66bf833aea2b05f2d2b603800.tar.gz samba-8a86e3cb4515ffe66bf833aea2b05f2d2b603800.tar.bz2 samba-8a86e3cb4515ffe66bf833aea2b05f2d2b603800.zip | |
drsblobs.idl: unify the Primary:Kerberos and Primary:Kerberos-Newer-Keys structs
metze
(This used to be commit 4b79a7678571ac2f7d5f827913fdcb419f5d2e20)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/idl/drsblobs.idl | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl index b0c93712b6..adfc010237 100644 --- a/source4/librpc/idl/drsblobs.idl +++ b/source4/librpc/idl/drsblobs.idl @@ -278,14 +278,14 @@ interface drsblobs { uint32 keytype; [value((value?value->length:0))] uint32 value_len; [relative,subcontext(0),subcontext_size(value_len),flag(NDR_REMAINING)] DATA_BLOB *value; - } package_PrimaryKerberosKey; + } package_PrimaryKerberosKey3; typedef struct { uint16 num_keys; uint16 num_old_keys; package_PrimaryKerberosString salt; - package_PrimaryKerberosKey keys[num_keys]; - package_PrimaryKerberosKey old_keys[num_old_keys]; + package_PrimaryKerberosKey3 keys[num_keys]; + package_PrimaryKerberosKey3 old_keys[num_old_keys]; [value(0)] uint32 padding1; [value(0)] uint32 padding2; [value(0)] uint32 padding3; @@ -293,19 +293,6 @@ interface drsblobs { [value(0)] uint32 padding5; } package_PrimaryKerberosCtr3; - typedef [nodiscriminant] union { - [case(3)] package_PrimaryKerberosCtr3 ctr3; - } package_PrimaryKerberosCtr; - - typedef [public] struct { - [value(3)] uint32 version; - [switch_is(version)] package_PrimaryKerberosCtr ctr; - } package_PrimaryKerberosBlob; - - void decode_PrimaryKerberos( - [in] package_PrimaryKerberosBlob blob - ); - typedef struct { [value(0)] uint16 reserved1; [value(0)] uint16 reserved2; @@ -314,7 +301,7 @@ interface drsblobs { uint32 keytype; [value((value?value->length:0))] uint32 value_len; [relative,subcontext(0),subcontext_size(value_len),flag(NDR_REMAINING)] DATA_BLOB *value; - } package_PrimaryKerberosNewerKey; + } package_PrimaryKerberosKey4; typedef struct { uint16 num_keys; @@ -323,23 +310,25 @@ interface drsblobs { uint16 num_older_keys; package_PrimaryKerberosString salt; uint32 default_iteration_count; - package_PrimaryKerberosNewerKey keys[num_keys]; - package_PrimaryKerberosNewerKey service_keys[num_service_keys]; - package_PrimaryKerberosNewerKey old_keys[num_old_keys]; - package_PrimaryKerberosNewerKey older_keys[num_older_keys]; - } package_PrimaryKerberosNewerCtr4; + package_PrimaryKerberosKey4 keys[num_keys]; + package_PrimaryKerberosKey4 service_keys[num_service_keys]; + package_PrimaryKerberosKey4 old_keys[num_old_keys]; + package_PrimaryKerberosKey4 older_keys[num_older_keys]; + } package_PrimaryKerberosCtr4; typedef [nodiscriminant] union { - [case(4)] package_PrimaryKerberosNewerCtr4 ctr4; - } package_PrimaryKerberosNewerCtr; + [case(3)] package_PrimaryKerberosCtr3 ctr3; + [case(4)] package_PrimaryKerberosCtr4 ctr4; + } package_PrimaryKerberosCtr; typedef [public] struct { - [value(4)] uint32 version; - [switch_is(version)] package_PrimaryKerberosNewerCtr ctr; - } package_PrimaryKerberosNewerBlob; + uint16 version; + [value(0)] uint16 flags; + [switch_is(version)] package_PrimaryKerberosCtr ctr; + } package_PrimaryKerberosBlob; - void decode_PrimaryKerberosNewer( - [in] package_PrimaryKerberosNewerBlob blob + void decode_PrimaryKerberos( + [in] package_PrimaryKerberosBlob blob ); typedef [public] struct { |