Adapt to new `krb5_authenticator'
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1913 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -109,22 +109,23 @@ krb5_rd_req_with_keyblock(krb5_context context,
|
|||||||
|
|
||||||
memset((*auth_context)->authenticator, 0,
|
memset((*auth_context)->authenticator, 0,
|
||||||
sizeof((*auth_context)->authenticator));
|
sizeof((*auth_context)->authenticator));
|
||||||
|
copy_Authenticator(&authenticator, (*auth_context)->authenticator);
|
||||||
{
|
{
|
||||||
krb5_principal p2;
|
krb5_principal p1, p2;
|
||||||
|
krb5_boolean res;
|
||||||
|
|
||||||
principalname2krb5_principal(&(*auth_context)->authenticator->cname,
|
principalname2krb5_principal(&p1,
|
||||||
authenticator.cname,
|
authenticator.cname,
|
||||||
authenticator.crealm);
|
authenticator.crealm);
|
||||||
principalname2krb5_principal(&p2,
|
principalname2krb5_principal(&p2,
|
||||||
t->tkt.cname,
|
t->tkt.cname,
|
||||||
t->tkt.crealm);
|
t->tkt.crealm);
|
||||||
if (!krb5_principal_compare (context,
|
res = krb5_principal_compare (context, p1, p2);
|
||||||
(*auth_context)->authenticator->cname,
|
krb5_free_principal (context, p1);
|
||||||
p2))
|
krb5_free_principal (context, p2);
|
||||||
|
if (!res)
|
||||||
return KRB5KRB_AP_ERR_BADMATCH;
|
return KRB5KRB_AP_ERR_BADMATCH;
|
||||||
}
|
}
|
||||||
(*auth_context)->authenticator->cusec = authenticator.cusec;
|
|
||||||
(*auth_context)->authenticator->ctime = authenticator.ctime;
|
|
||||||
|
|
||||||
if (authenticator.seq_number)
|
if (authenticator.seq_number)
|
||||||
(*auth_context)->remote_seqnumber = *(authenticator.seq_number);
|
(*auth_context)->remote_seqnumber = *(authenticator.seq_number);
|
||||||
@@ -133,6 +134,8 @@ krb5_rd_req_with_keyblock(krb5_context context,
|
|||||||
|
|
||||||
/* XXX - check addresses */
|
/* XXX - check addresses */
|
||||||
|
|
||||||
|
/* XXX - subkeys? */
|
||||||
|
|
||||||
if (ap_req_options) {
|
if (ap_req_options) {
|
||||||
*ap_req_options = 0;
|
*ap_req_options = 0;
|
||||||
if (ap_req.ap_options.use_session_key)
|
if (ap_req.ap_options.use_session_key)
|
||||||
|
Reference in New Issue
Block a user