(_krb5_mk_req_internal): Indent and remove unused code block.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16798 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -63,35 +63,13 @@ _krb5_mk_req_internal(krb5_context context,
|
|||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if(ac->local_subkey == NULL && (ap_req_options & AP_OPTS_USE_SUBKEY)) {
|
if(ac->local_subkey == NULL && (ap_req_options & AP_OPTS_USE_SUBKEY)) {
|
||||||
ret = krb5_auth_con_generatelocalsubkey(context, ac, &in_creds->session);
|
ret = krb5_auth_con_generatelocalsubkey(context,
|
||||||
|
ac,
|
||||||
|
&in_creds->session);
|
||||||
if(ret)
|
if(ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
{
|
|
||||||
/* This is somewhat bogus since we're possibly overwriting a
|
|
||||||
value specified by the user, but it's the easiest way to make
|
|
||||||
the code use a compatible enctype */
|
|
||||||
Ticket ticket;
|
|
||||||
krb5_keytype ticket_keytype;
|
|
||||||
|
|
||||||
ret = decode_Ticket(in_creds->ticket.data,
|
|
||||||
in_creds->ticket.length,
|
|
||||||
&ticket,
|
|
||||||
NULL);
|
|
||||||
krb5_enctype_to_keytype (context,
|
|
||||||
ticket.enc_part.etype,
|
|
||||||
&ticket_keytype);
|
|
||||||
|
|
||||||
if (ticket_keytype == in_creds->session.keytype)
|
|
||||||
krb5_auth_setenctype(context,
|
|
||||||
ac,
|
|
||||||
ticket.enc_part.etype);
|
|
||||||
free_Ticket(&ticket);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
krb5_free_keyblock(context, ac->keyblock);
|
krb5_free_keyblock(context, ac->keyblock);
|
||||||
ret = krb5_copy_keyblock(context, &in_creds->session, &ac->keyblock);
|
ret = krb5_copy_keyblock(context, &in_creds->session, &ac->keyblock);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
Reference in New Issue
Block a user