diff options
| author | Matthieu Patou <mat@matws.net> | 2010-08-15 18:31:28 +0400 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-10-03 01:15:04 +0000 |
| commit | ab6e3fce040f9ad27cbce44e9038a24f15b601c8 (patch) | |
| tree | ab99a431c9610927b5d0d26335d2712b509fd6dc /source4/heimdal/lib/ntlm | |
| parent | 197a1514d62494cc8b862d169c841a26e04b8925 (diff) | |
| download | samba-ab6e3fce040f9ad27cbce44e9038a24f15b601c8.tar.gz samba-ab6e3fce040f9ad27cbce44e9038a24f15b601c8.tar.bz2 samba-ab6e3fce040f9ad27cbce44e9038a24f15b601c8.zip | |
s4:heimdal: import lorikeet-heimdal-201009250123 (commit 42cabfb5b683dbcb97d583c397b897507689e382)
I based this on Matthieu's import of lorikeet-heimdal, and then
updated it to this commit.
Andrew Bartlett
Diffstat (limited to 'source4/heimdal/lib/ntlm')
| -rw-r--r-- | source4/heimdal/lib/ntlm/ntlm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/heimdal/lib/ntlm/ntlm.c b/source4/heimdal/lib/ntlm/ntlm.c index 71f96bfce2..8390d79acc 100644 --- a/source4/heimdal/lib/ntlm/ntlm.c +++ b/source4/heimdal/lib/ntlm/ntlm.c @@ -222,8 +222,6 @@ ret_string(krb5_storage *sp, int ucs2, struct sec_buffer *desc, char **s) ret = 0; out: return ret; - - return 0; } static krb5_error_code @@ -485,6 +483,10 @@ heim_ntlm_encode_type1(const struct ntlm_type1 *type1, struct ntlm_buf *data) domain.offset = base; domain.length = len_string(0, type1->domain); domain.allocated = domain.length; + } else { + domain.offset = 0; + domain.length = 0; + domain.allocated = 0; } if (type1->hostname) { hostname.offset = domain.allocated + domain.offset; |