diff options
author | Michael Adam <obnox@samba.org> | 2008-07-28 14:17:11 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2008-07-28 14:17:11 +0200 |
commit | d6b7f800d3d6ce6c9336498d7ec9b825c28b6c42 (patch) | |
tree | ff086ce8928ac27d363734f2303fad19c8dfd3b6 /source3/librpc/gen_ndr/drsblobs.h | |
parent | ace141e4880cae2541e25ee16fc8088deb826886 (diff) | |
download | samba-d6b7f800d3d6ce6c9336498d7ec9b825c28b6c42.tar.gz samba-d6b7f800d3d6ce6c9336498d7ec9b825c28b6c42.tar.bz2 samba-d6b7f800d3d6ce6c9336498d7ec9b825c28b6c42.zip |
run "make idl" after idl change to unify Primary:Kerberos* structs (e8ae49f)
Michael
(This used to be commit 6dd1582e3583ed3c0766db552a368ddb30af5f7d)
Diffstat (limited to 'source3/librpc/gen_ndr/drsblobs.h')
-rw-r--r-- | source3/librpc/gen_ndr/drsblobs.h | 47 |
1 files changed, 16 insertions, 31 deletions
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; |