diff options
| author | Günther Deschner <gd@samba.org> | 2006-02-20 23:22:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:16 -0500 |
| commit | 4ea92f30985466489a3b3faf5a1c90667175aad6 (patch) | |
| tree | 24e18123b87b06642767c05649989f37ff2628c6 /source3/libads/authdata.c | |
| parent | b7e7a5ef20d1da508afa6ad5a3bf852049951711 (diff) | |
| download | samba-4ea92f30985466489a3b3faf5a1c90667175aad6.tar.gz samba-4ea92f30985466489a3b3faf5a1c90667175aad6.tar.bz2 samba-4ea92f30985466489a3b3faf5a1c90667175aad6.zip | |
r13581: Correctly parse a non-null terminated, little-endian UCS2 string in the
PAC_LOGON_NAME structure. This was broken on big-endian machines
(Solaris SPARC and ppc). Fixes Bug #3330.
Jerry, this should be in 3.0.21c.
Guenther
(This used to be commit 9732490811f8f02ee547ddc6e2694e1122a3a518)
Diffstat (limited to 'source3/libads/authdata.c')
| -rw-r--r-- | source3/libads/authdata.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c index 55e736ce6a..bb4236c4fc 100644 --- a/source3/libads/authdata.c +++ b/source3/libads/authdata.c @@ -42,16 +42,7 @@ static BOOL pac_io_logon_name(const char *desc, PAC_LOGON_NAME *logon_name, if (!prs_uint16("len", ps, depth, &logon_name->len)) return False; - if (UNMARSHALLING(ps) && logon_name->len) { - logon_name->username = PRS_ALLOC_MEM(ps, uint16, logon_name->len); - if (!logon_name->username) { - DEBUG(3, ("No memory available\n")); - return False; - } - } - - if (!prs_uint16s(True, "name", ps, depth, logon_name->username, - (logon_name->len / sizeof(uint16)))) + if (!prs_string_len("name", ps, depth, logon_name->username, logon_name->len)) return False; return True; @@ -891,7 +882,8 @@ static void dump_pac_logon_info(PAC_LOGON_INFO *logon_info) { nt_status = NT_STATUS_INVALID_PARAMETER; goto out; } - rpcstr_pull(username, logon_name->username, sizeof(username), -1, STR_TERMINATE); + + rpcstr_pull(username, logon_name->username, sizeof(username), logon_name->len, 0); ret = smb_krb5_parse_name_norealm(context, username, &client_principal_pac); if (ret) { |