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:
Love Hörnquist Åstrand
2006-10-06 17:06:30 +00:00
parent 946f7b0a24
commit c7b54c3372
5 changed files with 31 additions and 16 deletions

View File

@@ -92,7 +92,8 @@ log_524 (krb5_context context,
char *cpn; char *cpn;
krb5_error_code ret; krb5_error_code ret;
ret = _krb5_principalname2krb5_principal(&client, et->cname, et->crealm); ret = _krb5_principalname2krb5_principal(context, &client,
et->cname, et->crealm);
if (ret) { if (ret) {
kdc_log(context, config, 0, "_krb5_principalname2krb5_principal: %s", kdc_log(context, config, 0, "_krb5_principalname2krb5_principal: %s",
krb5_get_err_text (context, ret)); krb5_get_err_text (context, ret));

View File

@@ -1006,7 +1006,8 @@ tgs_parse_request(krb5_context context,
goto out; goto out;
} }
_krb5_principalname2krb5_principal(&princ, _krb5_principalname2krb5_principal(context,
&princ,
ap_req.ticket.sname, ap_req.ticket.sname,
ap_req.ticket.realm); ap_req.ticket.realm);
@@ -1242,7 +1243,7 @@ tgs_build_reply(krb5_context context,
ret = KRB5KDC_ERR_POLICY; ret = KRB5KDC_ERR_POLICY;
goto out; goto out;
} }
_krb5_principalname2krb5_principal(&p, t->sname, t->realm); _krb5_principalname2krb5_principal(context, &p, t->sname, t->realm);
ret = _kdc_db_fetch(context, config, p, ret = _kdc_db_fetch(context, config, p,
HDB_F_GET_CLIENT|HDB_F_GET_SERVER, HDB_F_GET_CLIENT|HDB_F_GET_SERVER,
NULL, &uu); NULL, &uu);
@@ -1272,11 +1273,11 @@ tgs_build_reply(krb5_context context,
r = adtkt.crealm; r = adtkt.crealm;
} }
_krb5_principalname2krb5_principal(&sp, *s, r); _krb5_principalname2krb5_principal(context, &sp, *s, r);
ret = krb5_unparse_name(context, sp, &spn); ret = krb5_unparse_name(context, sp, &spn);
if (ret) if (ret)
goto out; goto out;
_krb5_principalname2krb5_principal(&cp, tgt->cname, tgt->crealm); _krb5_principalname2krb5_principal(context, &cp, tgt->cname, tgt->crealm);
ret = krb5_unparse_name(context, cp, &cpn); ret = krb5_unparse_name(context, cp, &cpn);
if (ret) if (ret)
goto out; goto out;
@@ -1448,7 +1449,8 @@ server_lookup:
goto out; goto out;
} }
ret = _krb5_principalname2krb5_principal(&client_principal, ret = _krb5_principalname2krb5_principal(context,
&client_principal,
self.name, self.name,
self.realm); self.realm);
free_PA_S4U2Self(&self); free_PA_S4U2Self(&self);
@@ -1538,7 +1540,8 @@ server_lookup:
goto out; goto out;
} }
ret = _krb5_principalname2krb5_principal(&client_principal, ret = _krb5_principalname2krb5_principal(context,
&client_principal,
adtkt.cname, adtkt.cname,
adtkt.crealm); adtkt.crealm);
if (ret) if (ret)

View File

@@ -137,7 +137,8 @@ _krb5_extract_ticket(krb5_context context,
time_t tmp_time; time_t tmp_time;
krb5_timestamp sec_now; krb5_timestamp sec_now;
ret = _krb5_principalname2krb5_principal (&tmp_principal, ret = _krb5_principalname2krb5_principal (context,
&tmp_principal,
rep->kdc_rep.cname, rep->kdc_rep.cname,
rep->kdc_rep.crealm); rep->kdc_rep.crealm);
if (ret) if (ret)
@@ -170,7 +171,8 @@ _krb5_extract_ticket(krb5_context context,
/* compare server */ /* compare server */
ret = _krb5_principalname2krb5_principal (&tmp_principal, ret = _krb5_principalname2krb5_principal (context,
&tmp_principal,
rep->kdc_rep.ticket.sname, rep->kdc_rep.ticket.sname,
rep->kdc_rep.ticket.realm); rep->kdc_rep.ticket.realm);
if (ret) if (ret)

View File

@@ -265,7 +265,8 @@ krb5_rd_cred(krb5_context context,
krb5_abortx(context, "internal error in ASN.1 encoder"); krb5_abortx(context, "internal error in ASN.1 encoder");
copy_EncryptionKey (&kci->key, &creds->session); copy_EncryptionKey (&kci->key, &creds->session);
if (kci->prealm && kci->pname) if (kci->prealm && kci->pname)
_krb5_principalname2krb5_principal (&creds->client, _krb5_principalname2krb5_principal (context,
&creds->client,
*kci->pname, *kci->pname,
*kci->prealm); *kci->prealm);
if (kci->flags) if (kci->flags)
@@ -279,7 +280,8 @@ krb5_rd_cred(krb5_context context,
if (kci->renew_till) if (kci->renew_till)
creds->times.renew_till = *kci->renew_till; creds->times.renew_till = *kci->renew_till;
if (kci->srealm && kci->sname) if (kci->srealm && kci->sname)
_krb5_principalname2krb5_principal (&creds->server, _krb5_principalname2krb5_principal (context,
&creds->server,
*kci->sname, *kci->sname,
*kci->srealm); *kci->srealm);
if (kci->caddr) if (kci->caddr)

View File

@@ -376,10 +376,14 @@ krb5_verify_ap_req2(krb5_context context,
if(ret) if(ret)
goto out; 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); ap_req->ticket.realm);
if (ret) goto out; 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); t->ticket.crealm);
if (ret) goto out; if (ret) goto out;
@@ -400,10 +404,12 @@ krb5_verify_ap_req2(krb5_context context,
krb5_principal p1, p2; krb5_principal p1, p2;
krb5_boolean res; krb5_boolean res;
_krb5_principalname2krb5_principal(&p1, _krb5_principalname2krb5_principal(context,
&p1,
ac->authenticator->cname, ac->authenticator->cname,
ac->authenticator->crealm); ac->authenticator->crealm);
_krb5_principalname2krb5_principal(&p2, _krb5_principalname2krb5_principal(context,
&p2,
t->ticket.cname, t->ticket.cname,
t->ticket.crealm); t->ticket.crealm);
res = krb5_principal_compare (context, p1, p2); res = krb5_principal_compare (context, p1, p2);
@@ -601,7 +607,8 @@ krb5_rd_req(krb5_context context,
return ret; return ret;
if(server == NULL){ if(server == NULL){
_krb5_principalname2krb5_principal(&service, _krb5_principalname2krb5_principal(context,
&service,
ap_req.ticket.sname, ap_req.ticket.sname,
ap_req.ticket.realm); ap_req.ticket.realm);
server = service; server = service;