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

Try both kdc server referral and the old client chasing mode.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22770 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-03-24 12:09:29 +00:00
parent 7acb20f92d
commit e46ef6c72a
1 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
lib/krb5/get_cred.c
View File

@@ -735,14 +735,14 @@ get_cred(server)
*/ */
static krb5_error_code static krb5_error_code
get_cred_from_kdc_flags(krb5_context context, get_cred_kdc_capath(krb5_context context,
krb5_kdc_flags flags, krb5_kdc_flags flags,
krb5_ccache ccache, krb5_ccache ccache,
krb5_creds *in_creds, krb5_creds *in_creds,
krb5_principal impersonate_principal, krb5_principal impersonate_principal,
Ticket *second_ticket, Ticket *second_ticket,
krb5_creds **out_creds, krb5_creds **out_creds,
krb5_creds ***ret_tgts) krb5_creds ***ret_tgts)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_creds *tgt, tmp_creds; krb5_creds *tgt, tmp_creds;
@@ -807,8 +807,8 @@ get_cred_from_kdc_flags(krb5_context context,
while(1){ while(1){
heim_general_string tgt_inst; heim_general_string tgt_inst;
ret = get_cred_from_kdc_flags(context, flags, ccache, &tmp_creds, ret = get_cred_kdc_capath(context, flags, ccache, &tmp_creds,
NULL, NULL, &tgt, ret_tgts); NULL, NULL, &tgt, ret_tgts);
if(ret) { if(ret) {
krb5_free_principal(context, tmp_creds.server); krb5_free_principal(context, tmp_creds.server);
krb5_free_principal(context, tmp_creds.client); krb5_free_principal(context, tmp_creds.client);
@@ -847,8 +847,8 @@ get_cred_from_kdc_flags(krb5_context context,
ret = ENOMEM; ret = ENOMEM;
} else { } else {
ret = get_cred_kdc_address (context, ccache, flags, NULL, ret = get_cred_kdc_address (context, ccache, flags, NULL,
in_creds, tgt, NULL, NULL, in_creds, tgt, impersonate_principal,
*out_creds); second_ticket, *out_creds);
if (ret) { if (ret) {
free (*out_creds); free (*out_creds);
*out_creds = NULL; *out_creds = NULL;
@@ -876,6 +876,8 @@ get_cred_kdc_referral(krb5_context context,
memset(&tgt, 0, sizeof(tgt)); memset(&tgt, 0, sizeof(tgt));
memset(&ticket, 0, sizeof(ticket)); memset(&ticket, 0, sizeof(ticket));
flags.b.canonicalize = 1;
*out_creds = NULL; *out_creds = NULL;
client_realm = krb5_principal_get_realm(context, in_creds->client); client_realm = krb5_principal_get_realm(context, in_creds->client);
@@ -997,6 +999,44 @@ out:
} }
/*
* Glue function between referrals version and old client chasing
* codebase.
*/
static krb5_error_code
get_cred_kdc_any(krb5_context context,
krb5_kdc_flags flags,
krb5_ccache ccache,
krb5_creds *in_creds,
krb5_principal impersonate_principal,
Ticket *second_ticket,
krb5_creds **out_creds,
krb5_creds ***ret_tgts)
{
krb5_error_code ret;
ret = get_cred_kdc_referral(context,
flags,
ccache,
in_creds,
impersonate_principal,
second_ticket,
out_creds,
ret_tgts);
if (ret == 0 || flags.b.canonicalize)
return ret;
return get_cred_kdc_capath(context,
flags,
ccache,
in_creds,
impersonate_principal,
second_ticket,
out_creds,
ret_tgts);
}
krb5_error_code KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_FUNCTION
krb5_get_cred_from_kdc_opt(krb5_context context, krb5_get_cred_from_kdc_opt(krb5_context context,
krb5_ccache ccache, krb5_ccache ccache,
@@ -1007,9 +1047,9 @@ krb5_get_cred_from_kdc_opt(krb5_context context,
{ {
krb5_kdc_flags f; krb5_kdc_flags f;
f.i = flags; f.i = flags;
return get_cred_kdc_referral(context, f, ccache, return get_cred_kdc_any(context, f, ccache,
in_creds, NULL, NULL, in_creds, NULL, NULL,
out_creds, ret_tgts); out_creds, ret_tgts);
} }
krb5_error_code KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_FUNCTION
@@ -1092,8 +1132,8 @@ krb5_get_credentials_with_flags(krb5_context context,
options |= KRB5_GC_NO_STORE; options |= KRB5_GC_NO_STORE;
tgts = NULL; tgts = NULL;
ret = get_cred_kdc_referral(context, flags, ccache, ret = get_cred_kdc_any(context, flags, ccache,
in_creds, NULL, NULL, out_creds, &tgts); in_creds, NULL, NULL, out_creds, &tgts);
for(i = 0; tgts && tgts[i]; i++) { for(i = 0; tgts && tgts[i]; i++) {
krb5_cc_store_cred(context, ccache, tgts[i]); krb5_cc_store_cred(context, ccache, tgts[i]);
krb5_free_creds(context, tgts[i]); krb5_free_creds(context, tgts[i]);
@@ -1306,9 +1346,9 @@ krb5_get_creds(krb5_context context,
flags.b.canonicalize = 1; flags.b.canonicalize = 1;
tgts = NULL; tgts = NULL;
ret = get_cred_kdc_referral(context, flags, ccache, ret = get_cred_kdc_any(context, flags, ccache,
&in_creds, opt->self, opt->ticket, &in_creds, opt->self, opt->ticket,
out_creds, &tgts); out_creds, &tgts);
krb5_free_principal(context, in_creds.client); krb5_free_principal(context, in_creds.client);
for(i = 0; tgts && tgts[i]; i++) { for(i = 0; tgts && tgts[i]; i++) {
krb5_cc_store_cred(context, ccache, tgts[i]); krb5_cc_store_cred(context, ccache, tgts[i]);