diff --git a/kdc/524.c b/kdc/524.c
index 746de887f..a46c9175b 100644
--- a/kdc/524.c
+++ b/kdc/524.c
@@ -92,7 +92,8 @@ log_524 (krb5_context context,
     char *cpn;
     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) {
 	kdc_log(context, config, 0, "_krb5_principalname2krb5_principal: %s",
 		krb5_get_err_text (context, ret));
diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index 89bc7cdf2..a606c16f9 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -1006,7 +1006,8 @@ tgs_parse_request(krb5_context context,
 	goto out;
     }
     
-    _krb5_principalname2krb5_principal(&princ,
+    _krb5_principalname2krb5_principal(context,
+				       &princ,
 				       ap_req.ticket.sname,
 				       ap_req.ticket.realm);
     
@@ -1242,7 +1243,7 @@ tgs_build_reply(krb5_context context,
 	    ret = KRB5KDC_ERR_POLICY;
 	    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, 
 			    HDB_F_GET_CLIENT|HDB_F_GET_SERVER, 
 			    NULL, &uu);
@@ -1272,11 +1273,11 @@ tgs_build_reply(krb5_context context,
 	r = adtkt.crealm;
     }
 
-    _krb5_principalname2krb5_principal(&sp, *s, r);
+    _krb5_principalname2krb5_principal(context, &sp, *s, r);
     ret = krb5_unparse_name(context, sp, &spn);	
     if (ret)
 	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);
     if (ret)
 	goto out;
@@ -1448,7 +1449,8 @@ server_lookup:
 		goto out;
 	    }
 
-	    ret = _krb5_principalname2krb5_principal(&client_principal,
+	    ret = _krb5_principalname2krb5_principal(context,
+						     &client_principal,
 						     self.name,
 						     self.realm);
 	    free_PA_S4U2Self(&self);
@@ -1538,7 +1540,8 @@ server_lookup:
 	    goto out;
 	}
 
-	ret = _krb5_principalname2krb5_principal(&client_principal,
+	ret = _krb5_principalname2krb5_principal(context,
+						 &client_principal,
 						 adtkt.cname,
 						 adtkt.crealm);
 	if (ret)
diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c
index 7e8201d28..108bb387d 100644
--- a/lib/krb5/get_in_tkt.c
+++ b/lib/krb5/get_in_tkt.c
@@ -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)
diff --git a/lib/krb5/rd_cred.c b/lib/krb5/rd_cred.c
index 420d93fe3..2d6e97fdc 100644
--- a/lib/krb5/rd_cred.c
+++ b/lib/krb5/rd_cred.c
@@ -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)
diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c
index bf5a7325d..dcc5aa0b5 100644
--- a/lib/krb5/rd_req.c
+++ b/lib/krb5/rd_req.c
@@ -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;