oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Use krb5_cc_get_config.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23395 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-07-26 18:26:49 +00:00
parent 4af9c1c89e
commit 23b129144f
1 changed files with 14 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/gssapi/ntlm/init_sec_context.c
View File

@@ -98,19 +98,16 @@ get_user_file(const ntlm_name target_name,
static int static int
get_user_ccache(const ntlm_name name, char **username, struct ntlm_buf *key) get_user_ccache(const ntlm_name name, char **username, struct ntlm_buf *key)
{ {
krb5_principal client;
krb5_context context = NULL; krb5_context context = NULL;
krb5_error_code ret;
krb5_ccache id = NULL; krb5_ccache id = NULL;
krb5_creds mcreds, creds; krb5_error_code ret;
char *confname;
krb5_data data;
*username = NULL; *username = NULL;
key->length = 0; key->length = 0;
key->data = NULL; key->data = NULL;
memset(&creds, 0, sizeof(creds));
memset(&mcreds, 0, sizeof(mcreds));
ret = krb5_init_context(&context); ret = krb5_init_context(&context);
if (ret) if (ret)
return ret; return ret;
@@ -119,54 +116,24 @@ get_user_ccache(const ntlm_name name, char **username, struct ntlm_buf *key)
if (ret) if (ret)
goto out; goto out;
ret = krb5_cc_get_principal(context, id, &client); asprintf(&confname, "ntlm-key-%s", name->domain);
if (ret) if (confname == NULL) {
goto out; krb5_clear_error_string(context);
return ENOMEM;
ret = krb5_unparse_name_flags(context, client,
KRB5_PRINCIPAL_UNPARSE_NO_REALM,
username);
if (ret)
goto out;
ret = krb5_make_principal(context, &mcreds.server,
krb5_principal_get_realm(context, client),
"@ntlm-key", name->domain, NULL);
krb5_free_principal(context, client);
if (ret)
goto out;
mcreds.session.keytype = ENCTYPE_ARCFOUR_HMAC_MD5;
ret = krb5_cc_retrieve_cred(context, id, KRB5_TC_MATCH_KEYTYPE,
&mcreds, &creds);
if (ret) {
const char *s = krb5_get_error_message(context, ret);
krb5_free_error_message(context, s);
goto out;
} }
key->data = malloc(creds.session.keyvalue.length); ret = krb5_cc_get_config(context, id, confname, &data);
key->data = malloc(data.length);
if (key->data == NULL) if (key->data == NULL)
goto out; goto out;
key->length = creds.session.keyvalue.length; key->length = data.length;
memcpy(key->data, creds.session.keyvalue.data, key->length); memcpy(key->data, data.data, data.length);
krb5_free_cred_contents(context, &creds);
return 0;
out: out:
if (*username) { krb5_data_free(&data);
free(*username);
*username = NULL;
}
krb5_free_cred_contents(context, &creds);
if (mcreds.server)
krb5_free_principal(context, mcreds.server);
if (id) if (id)
krb5_cc_close(context, id); krb5_cc_close(context, id);
if (context)
krb5_free_context(context);
return ret; return ret;
} }