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

use private version of principalname

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14424 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-12-29 19:22:28 +00:00
parent 69b55bfa0b
commit 6f41f39523
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kdc/524.c
View File

@@ -53,9 +53,9 @@ fetch_server (const Ticket *t,
krb5_error_code ret; krb5_error_code ret;
krb5_principal sprinc; krb5_principal sprinc;
ret = principalname2krb5_principal(&sprinc, t->sname, t->realm); ret = _krb5_principalname2krb5_principal(&sprinc, t->sname, t->realm);
if (ret) { if (ret) {
kdc_log(0, "principalname2krb5_principal: %s", kdc_log(0, "_krb5_principalname2krb5_principal: %s",
krb5_get_err_text(context, ret)); krb5_get_err_text(context, ret));
return ret; return ret;
} }
@@ -87,9 +87,9 @@ log_524 (const EncTicketPart *et,
char *cpn; char *cpn;
krb5_error_code ret; krb5_error_code ret;
ret = principalname2krb5_principal(&client, et->cname, et->crealm); ret = _krb5_principalname2krb5_principal(&client, et->cname, et->crealm);
if (ret) { if (ret) {
kdc_log(0, "principalname2krb5_principal: %s", kdc_log(0, "_krb5_principalname2krb5_principal: %s",
krb5_get_err_text (context, ret)); krb5_get_err_text (context, ret));
return ret; return ret;
} }

3
kdc/hpropd.c
View File

@@ -323,7 +323,8 @@ main(int argc, char **argv)
ret = krb5_make_principal(context, &c1, NULL, "kadmin", "hprop", NULL); ret = krb5_make_principal(context, &c1, NULL, "kadmin", "hprop", NULL);
if(ret) if(ret)
krb5_err(context, 1, ret, "krb5_make_principal"); krb5_err(context, 1, ret, "krb5_make_principal");
principalname2krb5_principal(&c2, authent->cname, authent->crealm); _krb5_principalname2krb5_principal(&c2,
authent->cname, authent->crealm);
if(!krb5_principal_compare(context, c1, c2)) { if(!krb5_principal_compare(context, c1, c2)) {
char *s; char *s;
ret = krb5_unparse_name(context, c2, &s); ret = krb5_unparse_name(context, c2, &s);

12
kdc/kerberos4.c
View File

@@ -517,9 +517,9 @@ encode_v4_ticket(void *buf, size_t len, const EncTicketPart *et,
{ {
krb5_principal princ; krb5_principal princ;
principalname2krb5_principal(&princ, _krb5_principalname2krb5_principal(&princ,
*service, *service,
et->crealm); et->crealm);
ret = krb5_524_conv_principal(context, ret = krb5_524_conv_principal(context,
princ, princ,
sname, sname,
@@ -529,9 +529,9 @@ encode_v4_ticket(void *buf, size_t len, const EncTicketPart *et,
if(ret) if(ret)
return ret; return ret;
principalname2krb5_principal(&princ, _krb5_principalname2krb5_principal(&princ,
et->cname, et->cname,
et->crealm); et->crealm);
ret = krb5_524_conv_principal(context, ret = krb5_524_conv_principal(context,
princ, princ,

20
kdc/kerberos5.c
View File

@@ -689,7 +689,8 @@ as_rep(KDC_REQ *req,
ret = KRB5KRB_ERR_GENERIC; ret = KRB5KRB_ERR_GENERIC;
e_text = "No server in request"; e_text = "No server in request";
} else{ } else{
principalname2krb5_principal (&server_princ, *(b->sname), b->realm); _krb5_principalname2krb5_principal (&server_princ,
*(b->sname), b->realm);
ret = krb5_unparse_name(context, server_princ, &server_name); ret = krb5_unparse_name(context, server_princ, &server_name);
} }
if (ret) { if (ret) {
@@ -701,7 +702,8 @@ as_rep(KDC_REQ *req,
ret = KRB5KRB_ERR_GENERIC; ret = KRB5KRB_ERR_GENERIC;
e_text = "No client in request"; e_text = "No client in request";
} else { } else {
principalname2krb5_principal (&client_princ, *(b->cname), b->realm); _krb5_principalname2krb5_principal (&client_princ,
*(b->cname), b->realm);
ret = krb5_unparse_name(context, client_princ, &client_name); ret = krb5_unparse_name(context, client_princ, &client_name);
} }
if (ret) { if (ret) {
@@ -1494,7 +1496,7 @@ tgs_make_reply(KDC_REQ_BODY *b,
copy_Realm(krb5_princ_realm(context, server->principal), copy_Realm(krb5_princ_realm(context, server->principal),
&rep.ticket.realm); &rep.ticket.realm);
krb5_principal2principalname(&rep.ticket.sname, server->principal); _krb5_principal2principalname(&rep.ticket.sname, server->principal);
copy_Realm(&tgt->crealm, &rep.crealm); copy_Realm(&tgt->crealm, &rep.crealm);
if (f.request_anonymous) if (f.request_anonymous)
make_anonymous_principalname (&tgt->cname); make_anonymous_principalname (&tgt->cname);
@@ -1755,9 +1757,9 @@ tgs_rep2(KDC_REQ_BODY *b,
goto out2; goto out2;
} }
principalname2krb5_principal(&princ, _krb5_principalname2krb5_principal(&princ,
ap_req.ticket.sname, ap_req.ticket.sname,
ap_req.ticket.realm); ap_req.ticket.realm);
ret = db_fetch(princ, &krbtgt); ret = db_fetch(princ, &krbtgt);
@@ -1950,7 +1952,7 @@ tgs_rep2(KDC_REQ_BODY *b,
ret = KRB5KDC_ERR_POLICY; ret = KRB5KDC_ERR_POLICY;
goto out2; goto out2;
} }
principalname2krb5_principal(&p, t->sname, t->realm); _krb5_principalname2krb5_principal(&p, t->sname, t->realm);
ret = db_fetch(p, &uu); ret = db_fetch(p, &uu);
krb5_free_principal(context, p); krb5_free_principal(context, p);
if(ret){ if(ret){
@@ -1971,11 +1973,11 @@ tgs_rep2(KDC_REQ_BODY *b,
r = adtkt.crealm; r = adtkt.crealm;
} }
principalname2krb5_principal(&sp, *s, r); _krb5_principalname2krb5_principal(&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;
principalname2krb5_principal(&cp, tgt->cname, tgt->crealm); _krb5_principalname2krb5_principal(&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;