summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-07-24 08:20:06 +0200
committerMichael Adam <obnox@samba.org>2008-07-28 14:16:14 +0200
commitace141e4880cae2541e25ee16fc8088deb826886 (patch)
treec09873fbf38adfe34a1bd79abb0959342dc4bea8 /source3
parent1ff0633e05891ab0218267aae2f4fcbfd2512b9f (diff)
downloadsamba-ace141e4880cae2541e25ee16fc8088deb826886.tar.gz
samba-ace141e4880cae2541e25ee16fc8088deb826886.tar.bz2
samba-ace141e4880cae2541e25ee16fc8088deb826886.zip
drsblobs.idl: unify the Primary:Kerberos and Primary:Kerberos-Newer-Keys structs
metze (cherry picked from commit 4b79a7678571ac2f7d5f827913fdcb419f5d2e20) (This used to be commit e8ae49fc2aadfeee696ad7fde1fee643e167537c)
Diffstat (limited to 'source3')
-rw-r--r--source3/librpc/idl/drsblobs.idl47
1 files changed, 18 insertions, 29 deletions
diff --git a/source3/librpc/idl/drsblobs.idl b/source3/librpc/idl/drsblobs.idl
index ed49c757c4..6fdca0ec43 100644
--- a/source3/librpc/idl/drsblobs.idl
+++ b/source3/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 {