diff options
author | Stefan Metzmacher <metze@samba.org> | 2007-02-16 16:02:30 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:48:25 -0500 |
commit | 613acb284f1d1bbd49991607a80d5f6f4f0324a0 (patch) | |
tree | 4a492d8eb4559822970a111183c8896e66e87bf3 | |
parent | 03e0d675cf7c8397513fe377142f96420ab6cbb2 (diff) | |
download | samba-613acb284f1d1bbd49991607a80d5f6f4f0324a0.tar.gz samba-613acb284f1d1bbd49991607a80d5f6f4f0324a0.tar.bz2 samba-613acb284f1d1bbd49991607a80d5f6f4f0324a0.zip |
r21392: - decode the salt utf16 string into a unix string
- fix parsing of Primary:Kerberos blob
metze
(This used to be commit c6fa95ef2263774901c8871396b4eec5b7409c5e)
-rw-r--r-- | source4/librpc/idl/drsblobs.idl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl index 3389308b2c..eddb49d0b1 100644 --- 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( |