diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c
index de70e856b..0d3e6e35b 100644
--- a/lib/krb5/get_cred.c
+++ b/lib/krb5/get_cred.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -284,30 +284,37 @@ fail:
     return ret;
 }
 
-static krb5_error_code
-get_krbtgt(krb5_context context,
-	   krb5_ccache  id,
-	   krb5_realm realm,
-	   krb5_creds **cred)
+krb5_error_code
+_krb5_get_krbtgt(krb5_context context,
+		 krb5_ccache  id,
+		 krb5_realm realm,
+		 krb5_creds **cred)
 {
     krb5_error_code ret;
     krb5_creds tmp_cred;
 
     memset(&tmp_cred, 0, sizeof(tmp_cred));
 
+    ret = krb5_cc_get_principal(context, id, &tmp_cred.client);
+    if (ret)
+	return ret;
+
     ret = krb5_make_principal(context, 
 			      &tmp_cred.server,
 			      realm,
 			      KRB5_TGS_NAME,
 			      realm,
 			      NULL);
-    if(ret)
+    if(ret) {
+	krb5_free_principal(context, tmp_cred.client);
 	return ret;
+    }
     ret = krb5_get_credentials(context,
 			       KRB5_GC_CACHED,
 			       id,
 			       &tmp_cred,
 			       cred);
+    krb5_free_principal(context, tmp_cred.client);
     krb5_free_principal(context, tmp_cred.server);
     if(ret)
 	return ret;
@@ -480,7 +487,7 @@ get_cred_kdc_usage(krb5_context context,
 	krb5_clear_error_string(context);
     }
     krb5_data_free(&resp);
-out:
+ out:
     if(subkey){
 	krb5_free_keyblock_contents(context, subkey);
 	free(subkey);
@@ -550,10 +557,10 @@ krb5_get_kdc_cred(krb5_context context,
 	krb5_set_error_string(context, "malloc: out of memory");
 	return ENOMEM;
     }
-    ret = get_krbtgt (context,
-		      id,
-		      in_creds->server->realm,
-		      &krbtgt);
+    ret = _krb5_get_krbtgt (context,
+			    id,
+			    in_creds->server->realm,
+			    &krbtgt);
     if(ret) {
 	free(*out_creds);
 	return ret;
@@ -667,7 +674,7 @@ get_cred_from_kdc_flags(krb5_context context,
 			      &tmp_creds.server,
 			      try_realm,
 			      KRB5_TGS_NAME,
-			      server_realm,
+			      server_realm, 
 			      NULL);
     if(ret){
 	krb5_free_principal(context, tmp_creds.client);