From dc351a579dbdffc5505205d3e1d5548f5e62336e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 17 Nov 2009 15:36:48 +1100 Subject: s4:heimdal: import lorikeet-heimdal-200911170333 (commit b532c294d974cead40a1183c71be644c6ccc2832) This fixes up connections to Windows 2003, because the previous import had a broken arcfour-hmac-md5 implementation (fixed in Heimdal 316fc6ff8ffb0cbb1ef3689685e9977c37405bc4) Andrew Bartlett --- source4/heimdal/lib/krb5/get_cred.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'source4/heimdal/lib/krb5/get_cred.c') diff --git a/source4/heimdal/lib/krb5/get_cred.c b/source4/heimdal/lib/krb5/get_cred.c index 63152bbfa6..7072137338 100644 --- a/source4/heimdal/lib/krb5/get_cred.c +++ b/source4/heimdal/lib/krb5/get_cred.c @@ -244,16 +244,12 @@ init_tgs_req (krb5_context context, if(ret) goto fail; - ret = krb5_generate_subkey_extended(context, &krbtgt->session, - ETYPE_NULL, &key); + ret = krb5_auth_con_generatelocalsubkey(context, ac, &krbtgt->session); if (ret) goto fail; - ret = krb5_auth_con_setlocalsubkey(context, ac, key); - if (ret) - goto fail; - - ret = set_auth_data (context, &t->req_body, &in_creds->authdata, key); + ret = set_auth_data (context, &t->req_body, &in_creds->authdata, + ac->local_subkey); if (ret) goto fail; @@ -265,12 +261,11 @@ init_tgs_req (krb5_context context, if(ret) goto fail; - *subkey = key; - key = NULL; - + ret = krb5_auth_con_getlocalsubkey(context, ac, subkey); + if (ret) + goto fail; + fail: - if (key) - krb5_free_keyblock (context, key); if (ac) krb5_auth_con_free(context, ac); if (ret) { -- cgit