Adapt to signature change of _krb5_principalname2krb5_principal.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18270 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -137,7 +137,8 @@ _krb5_extract_ticket(krb5_context context,
|
||||
time_t tmp_time;
|
||||
krb5_timestamp sec_now;
|
||||
|
||||
ret = _krb5_principalname2krb5_principal (&tmp_principal,
|
||||
ret = _krb5_principalname2krb5_principal (context,
|
||||
&tmp_principal,
|
||||
rep->kdc_rep.cname,
|
||||
rep->kdc_rep.crealm);
|
||||
if (ret)
|
||||
@@ -170,7 +171,8 @@ _krb5_extract_ticket(krb5_context context,
|
||||
|
||||
/* compare server */
|
||||
|
||||
ret = _krb5_principalname2krb5_principal (&tmp_principal,
|
||||
ret = _krb5_principalname2krb5_principal (context,
|
||||
&tmp_principal,
|
||||
rep->kdc_rep.ticket.sname,
|
||||
rep->kdc_rep.ticket.realm);
|
||||
if (ret)
|
||||
|
@@ -265,7 +265,8 @@ krb5_rd_cred(krb5_context context,
|
||||
krb5_abortx(context, "internal error in ASN.1 encoder");
|
||||
copy_EncryptionKey (&kci->key, &creds->session);
|
||||
if (kci->prealm && kci->pname)
|
||||
_krb5_principalname2krb5_principal (&creds->client,
|
||||
_krb5_principalname2krb5_principal (context,
|
||||
&creds->client,
|
||||
*kci->pname,
|
||||
*kci->prealm);
|
||||
if (kci->flags)
|
||||
@@ -279,7 +280,8 @@ krb5_rd_cred(krb5_context context,
|
||||
if (kci->renew_till)
|
||||
creds->times.renew_till = *kci->renew_till;
|
||||
if (kci->srealm && kci->sname)
|
||||
_krb5_principalname2krb5_principal (&creds->server,
|
||||
_krb5_principalname2krb5_principal (context,
|
||||
&creds->server,
|
||||
*kci->sname,
|
||||
*kci->srealm);
|
||||
if (kci->caddr)
|
||||
|
@@ -376,10 +376,14 @@ krb5_verify_ap_req2(krb5_context context,
|
||||
if(ret)
|
||||
goto out;
|
||||
|
||||
ret = _krb5_principalname2krb5_principal(&t->server, ap_req->ticket.sname,
|
||||
ret = _krb5_principalname2krb5_principal(context,
|
||||
&t->server,
|
||||
ap_req->ticket.sname,
|
||||
ap_req->ticket.realm);
|
||||
if (ret) goto out;
|
||||
ret = _krb5_principalname2krb5_principal(&t->client, t->ticket.cname,
|
||||
ret = _krb5_principalname2krb5_principal(context,
|
||||
&t->client,
|
||||
t->ticket.cname,
|
||||
t->ticket.crealm);
|
||||
if (ret) goto out;
|
||||
|
||||
@@ -400,10 +404,12 @@ krb5_verify_ap_req2(krb5_context context,
|
||||
krb5_principal p1, p2;
|
||||
krb5_boolean res;
|
||||
|
||||
_krb5_principalname2krb5_principal(&p1,
|
||||
_krb5_principalname2krb5_principal(context,
|
||||
&p1,
|
||||
ac->authenticator->cname,
|
||||
ac->authenticator->crealm);
|
||||
_krb5_principalname2krb5_principal(&p2,
|
||||
_krb5_principalname2krb5_principal(context,
|
||||
&p2,
|
||||
t->ticket.cname,
|
||||
t->ticket.crealm);
|
||||
res = krb5_principal_compare (context, p1, p2);
|
||||
@@ -601,7 +607,8 @@ krb5_rd_req(krb5_context context,
|
||||
return ret;
|
||||
|
||||
if(server == NULL){
|
||||
_krb5_principalname2krb5_principal(&service,
|
||||
_krb5_principalname2krb5_principal(context,
|
||||
&service,
|
||||
ap_req.ticket.sname,
|
||||
ap_req.ticket.realm);
|
||||
server = service;
|
||||
|
Reference in New Issue
Block a user