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

(find_keys): add client_name and server_name argument and use them,

Browse Source 
and adapt callers.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17264 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-26 15:22:57 +00:00
parent 0c3cff7fec
commit f9d85a2590
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
kdc/kerberos5.c
View File

@@ -120,7 +120,9 @@ static krb5_error_code
find_keys(krb5_context context, find_keys(krb5_context context,
krb5_kdc_configuration *config, krb5_kdc_configuration *config,
const hdb_entry_ex *client, const hdb_entry_ex *client,
const char *client_name,
const hdb_entry_ex *server, const hdb_entry_ex *server,
const char *server_name,
Key **ckey, Key **ckey,
krb5_enctype *cetype, krb5_enctype *cetype,
Key **skey, Key **skey,
@@ -128,20 +130,14 @@ find_keys(krb5_context context,
krb5_enctype *etypes, krb5_enctype *etypes,
unsigned num_etypes) unsigned num_etypes)
{ {
char unparse_name[] = "krb5_unparse_name failed";
krb5_error_code ret; krb5_error_code ret;
char *name;
if(client){ if(client){
/* find client key */ /* find client key */
ret = find_etype(context, client, etypes, num_etypes, ckey, cetype); ret = find_etype(context, client, etypes, num_etypes, ckey, cetype);
if (ret) { if (ret) {
if (krb5_unparse_name(context, client->entry.principal, &name) != 0)
name = unparse_name;
kdc_log(context, config, 0, kdc_log(context, config, 0,
"Client (%s) has no support for etypes", name); "Client (%s) has no support for etypes", client_name);
if (name != unparse_name)
free(name);
return ret; return ret;
} }
} }
@@ -150,12 +146,8 @@ find_keys(krb5_context context,
/* find server key */ /* find server key */
ret = find_etype(context, server, etypes, num_etypes, skey, setype); ret = find_etype(context, server, etypes, num_etypes, skey, setype);
if (ret) { if (ret) {
if (krb5_unparse_name(context, server->entry.principal, &name) != 0)
name = unparse_name;
kdc_log(context, config, 0, kdc_log(context, config, 0,
"Server (%s) has no support for etypes", name); "Server (%s) has no support for etypes", server_name);
if (name != unparse_name)
free(name);
return ret; return ret;
} }
} }
@@ -1190,7 +1182,9 @@ _kdc_as_rep(krb5_context context,
} }
ret = find_keys(context, config, ret = find_keys(context, config,
client, server, &ckey, &cetype, &skey, &setype, client, client_name,
server, server_name,
&ckey, &cetype, &skey, &setype,
b->etype.val, b->etype.len); b->etype.val, b->etype.len);
if(ret) { if(ret) {
kdc_log(context, config, 0, "Server/client has no support for etypes"); kdc_log(context, config, 0, "Server/client has no support for etypes");
@@ -1737,6 +1731,7 @@ tgs_make_reply(krb5_context context,
EncTicketPart *adtkt, EncTicketPart *adtkt,
AuthorizationData *auth_data, AuthorizationData *auth_data,
hdb_entry_ex *server, hdb_entry_ex *server,
const char *server_name,
hdb_entry_ex *client, hdb_entry_ex *client,
krb5_principal client_principal, krb5_principal client_principal,
hdb_entry_ex *krbtgt, hdb_entry_ex *krbtgt,
@@ -1766,7 +1761,8 @@ tgs_make_reply(krb5_context context,
etype = b->etype.val[i]; etype = b->etype.val[i];
}else{ }else{
ret = find_keys(context, config, ret = find_keys(context, config,
NULL, server, NULL, NULL, &skey, &etype, NULL, NULL, server, server_name,
NULL, NULL, &skey, &etype,
b->etype.val, b->etype.len); b->etype.val, b->etype.len);
if(ret) { if(ret) {
kdc_log(context, config, 0, "Server has no support for etypes"); kdc_log(context, config, 0, "Server has no support for etypes");
@@ -2452,6 +2448,7 @@ tgs_rep2(krb5_context context,
b->kdc_options.enc_tkt_in_skey ? &adtkt : NULL, b->kdc_options.enc_tkt_in_skey ? &adtkt : NULL,
auth_data, auth_data,
server, server,
spn,
client, client,
cp, cp,
krbtgt, krbtgt,