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

Remove _kdc_find_etype(), its no longer used.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17934 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-08-24 11:52:29 +00:00
parent 8d4ecf6fe3
commit 687cb26c9e
2 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
kdc/kerberos5.c
View File

@@ -87,10 +87,10 @@ _kdc_find_padata(KDC_REQ *req, int *start, int type)
* one, but preferring one that has default salt
*/
static krb5_error_code
find_etype(krb5_context context, const hdb_entry_ex *princ,
krb5_enctype *etypes, unsigned len,
Key **ret_key, krb5_enctype *ret_etype)
krb5_error_code
_kdc_find_etype(krb5_context context, const hdb_entry_ex *princ,
krb5_enctype *etypes, unsigned len,
Key **ret_key, krb5_enctype *ret_etype)
{
int i;
krb5_error_code ret = KRB5KDC_ERR_ETYPE_NOSUPP;
@@ -116,27 +116,6 @@ find_etype(krb5_context context, const hdb_entry_ex *princ,
return ret;
}
krb5_error_code
_kdc_find_keys(krb5_context context,
krb5_kdc_configuration *config,
const char *type,
const hdb_entry_ex *entry,
const char *entry_name,
Key **key,
krb5_enctype *etype,
krb5_enctype *etypes,
unsigned num_etypes)
{
krb5_error_code ret;
/* find client key */
ret = find_etype(context, entry, etypes, num_etypes, key, etype);
if (ret)
kdc_log(context, config, 0,
"%s (%s) has no support for etypes", type, entry_name);
return ret;
}
krb5_error_code
_kdc_make_anonymous_principalname (PrincipalName *pn)
{
@@ -1176,12 +1155,13 @@ _kdc_as_rep(krb5_context context,
* KDC runtime enctypes.
*/
ret = _kdc_find_keys(context, config, "Client",
client, client_name,
&ckey, &cetype,
b->etype.val, b->etype.len);
if(ret)
ret = _kdc_find_etype(context, client, b->etype.val, b->etype.len,
&ckey, &cetype);
if (ret) {
kdc_log(context, config, 0,
"Client (%s) has no support for etypes", client_name);
goto out;
}
ret = _kdc_get_preferred_key(context, config,
server, server_name,

11
kdc/krb5tgs.c
View File

@@ -364,12 +364,13 @@ tgs_make_reply(krb5_context context,
}
etype = b->etype.val[i];
}else{
ret = _kdc_find_keys(context, config, "Server",
server, server_name,
&skey, &etype,
b->etype.val, b->etype.len);
if(ret)
ret = _kdc_find_etype(context, server, b->etype.val, b->etype.len,
&skey, &etype);
if(ret) {
kdc_log(context, config, 0,
"Server (%s) has no support for etypes", server_name);
return ret;
}
ekey = &skey->key;
}