s4:heimdal: import lorikeet-heimdal-201009250123 (commit 42cabfb5b683dbcb97d583c397b8...

[samba.git] / source4 / heimdal / lib / ntlm / ntlm.c

diff --git a/source4/heimdal/lib/ntlm/ntlm.c b/source4/heimdal/lib/ntlm/ntlm.c
index 71f96bfce299752f2a7575fde3c047fccd4f2137..8390d79acc3c4e47bf408619e08a0b3189df93c2 100644 (file)
--- 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;