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

Try harder to use the right principal.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21407 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-07-04 12:36:49 +00:00
parent 414eb7c4fe
commit 3523d2bfc5
1 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
lib/kadm5/init_c.c
View File

@@ -234,20 +234,27 @@ get_new_cache(krb5_context context,
static krb5_error_code static krb5_error_code
get_cache_principal(krb5_context context, get_cache_principal(krb5_context context,
krb5_ccache id, krb5_ccache *id,
krb5_principal *client) krb5_principal *client)
{ {
krb5_error_code ret; krb5_error_code ret;
const char *name, *inst; const char *name, *inst;
krb5_principal p1, p2; krb5_principal p1, p2;
ret = krb5_cc_get_principal(context, id, &p1); ret = krb5_cc_default(context, id);
if(ret) if(ret)
return ret; return ret;
ret = krb5_cc_get_principal(context, *id, &p1);
if(ret) {
krb5_cc_close(context, *id);
return ret;
}
ret = krb5_make_principal(context, &p2, NULL, ret = krb5_make_principal(context, &p2, NULL,
"kadmin", "admin", NULL); "kadmin", "admin", NULL);
if (ret) { if (ret) {
krb5_cc_close(context, *id);
krb5_free_principal(context, p1); krb5_free_principal(context, p1);
return ret; return ret;
} }
@@ -264,7 +271,7 @@ get_cache_principal(krb5_context context,
/* check for initial ticket kadmin/admin */ /* check for initial ticket kadmin/admin */
ret = krb5_get_credentials_with_flags(context, KRB5_GC_CACHED, flags, ret = krb5_get_credentials_with_flags(context, KRB5_GC_CACHED, flags,
id, &in, &out); *id, &in, &out);
krb5_free_principal(context, p2); krb5_free_principal(context, p2);
if (ret == 0) { if (ret == 0) {
if (out->flags.b.initial) { if (out->flags.b.initial) {
@@ -275,6 +282,8 @@ get_cache_principal(krb5_context context,
krb5_free_creds(context, out); krb5_free_creds(context, out);
} }
} }
krb5_cc_close(context, *id);
*id = NULL;
name = krb5_principal_get_comp_string(context, p1, 0); name = krb5_principal_get_comp_string(context, p1, 0);
inst = krb5_principal_get_comp_string(context, p1, 1); inst = krb5_principal_get_comp_string(context, p1, 1);
@@ -319,55 +328,43 @@ _kadm5_c_get_cred_cache(krb5_context context,
return ret; return ret;
} }
if(password != NULL || prompter != NULL) { if(ccache != NULL) {
id = ccache;
ret = krb5_cc_get_principal(context, id, &client);
if(ret)
return ret;
} else {
/* get principal from default cache, ok if this doesn't work */ /* get principal from default cache, ok if this doesn't work */
ret = krb5_cc_default(context, &id);
if(ret == 0) {
ret = get_cache_principal(context, id, &default_client);
if (ret) {
krb5_cc_close(context, id);
id = NULL;
}
}
if (client != NULL) { ret = get_cache_principal(context, &id, &default_client);
/* A client was specified by the caller. */ if (ret) {
if (default_client != NULL) { /*
krb5_free_principal(context, default_client); * No client was specified by the caller and we cannot
default_client = NULL; * determine the client from a credentials cache.
}
}
else if (default_client != NULL)
/* No client was specified by the caller, but we have a
* client from the default credentials cache.
*/
client = default_client;
else {
/* No client was specified by the caller and we cannot determine
* the client from a credentials cache.
*/ */
const char *user; const char *user;
user = get_default_username (); user = get_default_username ();
if(user == NULL) if(user == NULL) {
krb5_set_error_string(context, "Unable to find local user name");
return KADM5_FAILURE; return KADM5_FAILURE;
}
ret = krb5_make_principal(context, &client, ret = krb5_make_principal(context, &client,
NULL, user, "admin", NULL); NULL, user, "admin", NULL);
if(ret) if(ret)
return ret; return ret;
if (id != NULL) {
krb5_cc_close(context, id);
id = NULL;
}
} }
} else if(ccache != NULL) {
id = ccache;
ret = krb5_cc_get_principal(context, id, &client);
if(ret)
return ret;
} }
/*
* No client was specified by the caller, but we have a client
* from the default credentials cache.
*/
if (client == NULL && default_client != NULL)
client = default_client;
if(id && (default_client == NULL || if(id && (default_client == NULL ||
krb5_principal_compare(context, client, default_client))) { krb5_principal_compare(context, client, default_client))) {