Index: crypto/heimdal/kcm/acquire.c
===================================================================
--- crypto/heimdal/kcm/acquire.c
+++ crypto/heimdal/kcm/acquire.c
@@ -78,7 +78,7 @@
 	ret = krb5_unparse_name(context, ccache->server, &in_tkt_service);
 	if (ret) {
 	    kcm_log(0, "Failed to unparse service principal name for cache %s: %s",
-		    ccache->name, krb5_get_err_text(context, ret));
+		    ccache->name, krb5_get_error_message(context, ret));
 	    return ret;
 	}
     }
@@ -115,7 +115,7 @@
 
     if (ret) {
 	kcm_log(0, "Failed to acquire credentials for cache %s: %s",
-		ccache->name, krb5_get_err_text(context, ret));
+		ccache->name, krb5_get_error_message(context, ret));
 	if (in_tkt_service != NULL)
 	    free(in_tkt_service);
 	goto out;
@@ -130,7 +130,7 @@
     ret = kcm_ccache_store_cred_internal(context, ccache, &cred, 0, credp);
     if (ret) {
 	kcm_log(0, "Failed to store credentials for cache %s: %s",
-		ccache->name, krb5_get_err_text(context, ret));
+		ccache->name, krb5_get_error_message(context, ret));
 	krb5_free_cred_contents(context, &cred);
 	goto out;
     }
Index: crypto/heimdal/kcm/client.c
===================================================================
--- crypto/heimdal/kcm/client.c
+++ crypto/heimdal/kcm/client.c
@@ -47,7 +47,7 @@
     ret = kcm_ccache_resolve(context, name, ccache);
     if (ret) {
 	kcm_log(1, "Failed to resolve cache %s: %s",
-		name, krb5_get_err_text(context, ret));
+		name, krb5_get_error_message(context, ret));
 	return ret;
     }
 
@@ -71,7 +71,7 @@
     ret = kcm_ccache_resolve(context, name, &ccache);
     if (ret) {
 	kcm_log(1, "Failed to resolve cache %s: %s",
-		name, krb5_get_err_text(context, ret));
+		name, krb5_get_error_message(context, ret));
 	return ret;
     }
 
@@ -128,7 +128,7 @@
 	ret = kcm_ccache_new(context, name, &ccache);
 	if (ret) {
 	    kcm_log(1, "Failed to initialize cache %s: %s",
-		    name, krb5_get_err_text(context, ret));
+		    name, krb5_get_error_message(context, ret));
 	    return ret;
 	}
 
@@ -140,7 +140,7 @@
 	ret = kcm_zero_ccache_data(context, ccache);
 	if (ret) {
 	    kcm_log(1, "Failed to empty cache %s: %s",
-		    name, krb5_get_err_text(context, ret));
+		    name, krb5_get_error_message(context, ret));
 	    kcm_release_ccache(context, ccache);
 	    return ret;
 	}
Index: crypto/heimdal/kcm/events.c
===================================================================
--- crypto/heimdal/kcm/events.c
+++ crypto/heimdal/kcm/events.c
@@ -416,13 +416,13 @@
 	    ret = kcm_fire_event(context, e);
 	    if (ret) {
 		kcm_log(1, "Could not fire event for cache %s: %s",
-			(*e)->ccache->name, krb5_get_err_text(context, ret));
+			(*e)->ccache->name, krb5_get_error_message(context, ret));
 	    }
 	} else if ((*e)->expire_time && now >= (*e)->expire_time) {
 	    ret = kcm_remove_event_internal(context, e);
 	    if (ret) {
 		kcm_log(1, "Could not expire event for cache %s: %s",
-			(*e)->ccache->name, krb5_get_err_text(context, ret));
+			(*e)->ccache->name, krb5_get_error_message(context, ret));
 	    }
 	}
 
Index: crypto/heimdal/kcm/renew.c
===================================================================
--- crypto/heimdal/kcm/renew.c
+++ crypto/heimdal/kcm/renew.c
@@ -67,7 +67,7 @@
 	ret = krb5_copy_principal(context, ccache->server, &in.server);
 	if (ret) {
 	    kcm_log(0, "Failed to copy service principal: %s",
-		    krb5_get_err_text(context, ret));
+		    krb5_get_error_message(context, ret));
 	    goto out;
 	}
     } else {
@@ -76,7 +76,7 @@
 				  KRB5_TGS_NAME, realm, NULL);
 	if (ret) {
 	    kcm_log(0, "Failed to make TGS principal for realm %s: %s",
-		    realm, krb5_get_err_text(context, ret));
+		    realm, krb5_get_error_message(context, ret));
 	    goto out;
 	}
     }
@@ -99,7 +99,7 @@
 			    &out);
     if (ret) {
 	kcm_log(0, "Failed to renew credentials for cache %s: %s",
-		ccache->name, krb5_get_err_text(context, ret));
+		ccache->name, krb5_get_error_message(context, ret));
 	goto out;
     }
 
@@ -109,7 +109,7 @@
     ret = kcm_ccache_store_cred_internal(context, ccache, out, 0, credp);
     if (ret) {
 	kcm_log(0, "Failed to store credentials for cache %s: %s",
-		ccache->name, krb5_get_err_text(context, ret));
+		ccache->name, krb5_get_error_message(context, ret));
 	krb5_free_creds(context, out);
 	goto out;
     }