r21392: - decode the salt utf16 string into a unix string

- fix parsing of Primary:Kerberos blob

metze
(This used to be commit c6fa95ef2263774901c8871396b4eec5b7409c5e)

diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl
index 3389308b2cc8515684be1f4befc842fe960e8f46..eddb49d0b114701308d569557630ccdb3d3b697f 100644 (file)
--- a/source4/librpc/idl/drsblobs.idl
+++ b/source4/librpc/idl/drsblobs.idl
@@ -255,9 +255,9 @@ interface drsblobs {
                );
 
        typedef struct {
-               [value((string?string->length:0))] uint16 length;
-               [value((string?string->length:0))] uint16 size;
-               [relative,subcontext(0),subcontext_size(size),flag(NDR_REMAINING)] DATA_BLOB *string;
+               [value(2*strlen_m(string))] uint16 length;
+               [value(2*strlen_m(string))] uint16 size;
+               [relative,subcontext(0),subcontext_size(size),flag(STR_NOTERM|NDR_REMAINING)] string *string;
        } package_PrimaryKerberosString;
 
        typedef struct {
@@ -277,7 +277,8 @@ interface drsblobs {
                uint32 unknown2;
                package_PrimaryKerberosKey keys1[num_keys1];
                package_PrimaryKerberosKey keys2[num_keys2];
-               udlong unknown3[4];
+               udlong unknown3_1[num_keys1];
+               udlong unknown3_2[num_keys2];
        } package_PrimaryKerberosBlob;
 
        void decode_PrimaryKerberos(