From 6f41f39523927b1419db8aa90652d6b5177f17a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Wed, 29 Dec 2004 19:22:28 +0000
Subject: [PATCH] use private version of principalname

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14424 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kdc/524.c       |  8 ++++----
 kdc/hpropd.c    |  3 ++-
 kdc/kerberos4.c | 12 ++++++------
 kdc/kerberos5.c | 20 +++++++++++---------
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/kdc/524.c b/kdc/524.c
index 97cea409a..4e273f4b9 100644
--- a/kdc/524.c
+++ b/kdc/524.c
@@ -53,9 +53,9 @@ fetch_server (const Ticket *t,
     krb5_error_code ret;
     krb5_principal sprinc;
 
-    ret = principalname2krb5_principal(&sprinc, t->sname, t->realm);
+    ret = _krb5_principalname2krb5_principal(&sprinc, t->sname, t->realm);
     if (ret) {
-	kdc_log(0, "principalname2krb5_principal: %s",
+	kdc_log(0, "_krb5_principalname2krb5_principal: %s",
 		krb5_get_err_text(context, ret));
 	return ret;
     }
@@ -87,9 +87,9 @@ log_524 (const EncTicketPart *et,
     char *cpn;
     krb5_error_code ret;
 
-    ret = principalname2krb5_principal(&client, et->cname, et->crealm);
+    ret = _krb5_principalname2krb5_principal(&client, et->cname, et->crealm);
     if (ret) {
-	kdc_log(0, "principalname2krb5_principal: %s",
+	kdc_log(0, "_krb5_principalname2krb5_principal: %s",
 		krb5_get_err_text (context, ret));
 	return ret;
     }
diff --git a/kdc/hpropd.c b/kdc/hpropd.c
index 8e8f73a2d..572ad5a90 100644
--- a/kdc/hpropd.c
+++ b/kdc/hpropd.c
@@ -323,7 +323,8 @@ main(int argc, char **argv)
 	ret = krb5_make_principal(context, &c1, NULL, "kadmin", "hprop", NULL);
 	if(ret)
 	    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)) {
 	    char *s;
 	    ret = krb5_unparse_name(context, c2, &s);
diff --git a/kdc/kerberos4.c b/kdc/kerberos4.c
index 40e967ab3..b8229c274 100644
--- a/kdc/kerberos4.c
+++ b/kdc/kerberos4.c
@@ -517,9 +517,9 @@ encode_v4_ticket(void *buf, size_t len, const EncTicketPart *et,
 
     {
 	krb5_principal princ;
-	principalname2krb5_principal(&princ,
-				     *service,
-				     et->crealm);
+	_krb5_principalname2krb5_principal(&princ,
+					   *service,
+					   et->crealm);
 	ret = krb5_524_conv_principal(context, 
 				      princ,
 				      sname,
@@ -529,9 +529,9 @@ encode_v4_ticket(void *buf, size_t len, const EncTicketPart *et,
 	if(ret)
 	    return ret;
 
-	principalname2krb5_principal(&princ,
-				     et->cname,
-				     et->crealm);
+	_krb5_principalname2krb5_principal(&princ,
+					   et->cname,
+					   et->crealm);
 				     
 	ret = krb5_524_conv_principal(context, 
 				      princ,
diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index c7984f047..b1193b3f8 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -689,7 +689,8 @@ as_rep(KDC_REQ *req,
 	ret = KRB5KRB_ERR_GENERIC;
 	e_text = "No server in request";
     } 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);
     }
     if (ret) {
@@ -701,7 +702,8 @@ as_rep(KDC_REQ *req,
 	ret = KRB5KRB_ERR_GENERIC;
 	e_text = "No client in request";
     } 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);
     }
     if (ret) {
@@ -1494,7 +1496,7 @@ tgs_make_reply(KDC_REQ_BODY *b,
 
     copy_Realm(krb5_princ_realm(context, server->principal), 
 	       &rep.ticket.realm);
-    krb5_principal2principalname(&rep.ticket.sname, server->principal);
+    _krb5_principal2principalname(&rep.ticket.sname, server->principal);
     copy_Realm(&tgt->crealm, &rep.crealm);
     if (f.request_anonymous)
 	make_anonymous_principalname (&tgt->cname);
@@ -1755,9 +1757,9 @@ tgs_rep2(KDC_REQ_BODY *b,
 	goto out2;
     }
     
-    principalname2krb5_principal(&princ,
-				 ap_req.ticket.sname,
-				 ap_req.ticket.realm);
+    _krb5_principalname2krb5_principal(&princ,
+				       ap_req.ticket.sname,
+				       ap_req.ticket.realm);
     
     ret = db_fetch(princ, &krbtgt);
 
@@ -1950,7 +1952,7 @@ tgs_rep2(KDC_REQ_BODY *b,
 		ret = KRB5KDC_ERR_POLICY;
 		goto out2;
 	    }
-	    principalname2krb5_principal(&p, t->sname, t->realm);
+	    _krb5_principalname2krb5_principal(&p, t->sname, t->realm);
 	    ret = db_fetch(p, &uu);
 	    krb5_free_principal(context, p);
 	    if(ret){
@@ -1971,11 +1973,11 @@ tgs_rep2(KDC_REQ_BODY *b,
 	    r = adtkt.crealm;
 	}
 
-	principalname2krb5_principal(&sp, *s, r);
+	_krb5_principalname2krb5_principal(&sp, *s, r);
 	ret = krb5_unparse_name(context, sp, &spn);	
 	if (ret)
 	    goto out;
-	principalname2krb5_principal(&cp, tgt->cname, tgt->crealm);
+	_krb5_principalname2krb5_principal(&cp, tgt->cname, tgt->crealm);
 	ret = krb5_unparse_name(context, cp, &cpn);
 	if (ret)
 	    goto out;