From 99f53c4c8ba37a27d1f75f38e58e0db4d8f34ecf Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Mon, 18 Jun 2001 13:11:33 +0000
Subject: [PATCH] new krb524_convert_creds_kdc_ccache

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10113 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/login/login.c            | 2 +-
 appl/xnlock/xnlock.c          | 2 +-
 kuser/kinit.c                 | 2 +-
 lib/45/get_ad_tkt.c           | 2 +-
 lib/auth/afskauthlib/verify.c | 2 +-
 lib/kafs/afskrb5.c            | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/appl/login/login.c b/appl/login/login.c
index 0a4844b05..a4213d116 100644
--- a/appl/login/login.c
+++ b/appl/login/login.c
@@ -218,7 +218,7 @@ krb5_to4 (krb5_ccache id)
 
 	ret = krb5_cc_retrieve_cred(context, id, 0, &mcred, &cred);
 	if(ret == 0) {
-	    ret = krb524_convert_creds_kdc(context, id, &cred, &c);
+	    ret = krb524_convert_creds_kdc_ccache(context, id, &cred, &c);
 	    if(ret == 0) {
 		snprintf(krb4tkfile,sizeof(krb4tkfile),"%s%d",TKT_ROOT,
 			 getuid());
diff --git a/appl/xnlock/xnlock.c b/appl/xnlock/xnlock.c
index 56f7ae7a0..9d9b9b5c9 100644
--- a/appl/xnlock/xnlock.c
+++ b/appl/xnlock/xnlock.c
@@ -583,7 +583,7 @@ verify_krb5(const char *password)
 				NULL);
 	    ret = krb5_cc_retrieve_cred(context, id, 0, &mcred, &cred);
 	    if(ret == 0) {
-		ret = krb524_convert_creds_kdc(context, id, &cred, &c);
+		ret = krb524_convert_creds_kdc_ccache(context, id, &cred, &c);
 		if(ret == 0) 
 		    tf_setup(&c, c.pname, c.pinst);
 		memset(&c, 0, sizeof(c));
diff --git a/kuser/kinit.c b/kuser/kinit.c
index bfac891a4..ec15b76c5 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -579,7 +579,7 @@ main (int argc, char **argv)
 #ifdef KRB4
     if(get_v4_tgt) {
 	CREDENTIALS c;
-	ret = krb524_convert_creds_kdc(context, ccache, &cred, &c);
+	ret = krb524_convert_creds_kdc_ccache(context, ccache, &cred, &c);
 	if(ret)
 	    krb5_warn(context, ret, "converting creds");
 	else
diff --git a/lib/45/get_ad_tkt.c b/lib/45/get_ad_tkt.c
index 6cbacfaa8..0d5afdabb 100644
--- a/lib/45/get_ad_tkt.c
+++ b/lib/45/get_ad_tkt.c
@@ -100,7 +100,7 @@ get_ad_tkt(char *service, char *sinstance, char *realm, int lifetime)
 	krb5_free_context(context);
 	return KFAILURE;
     }
-    ret = krb524_convert_creds_kdc(context, id, out_creds, &cred);
+    ret = krb524_convert_creds_kdc_ccache(context, id, out_creds, &cred);
     krb5_cc_close(context, id);
     krb5_free_context(context);
     krb5_free_creds(context, out_creds);
diff --git a/lib/auth/afskauthlib/verify.c b/lib/auth/afskauthlib/verify.c
index f762b52e2..980d3ab47 100644
--- a/lib/auth/afskauthlib/verify.c
+++ b/lib/auth/afskauthlib/verify.c
@@ -179,7 +179,7 @@ verify_krb5(struct passwd *pwd,
 	free (realm);
 	ret = krb5_cc_retrieve_cred(context, ccache, 0, &mcred, &cred);
 	if(ret == 0) {
-	    ret = krb524_convert_creds_kdc(context, ccache, &cred, &c);
+	    ret = krb524_convert_creds_kdc_ccache(context, ccache, &cred, &c);
 	    if(ret)
 		krb5_warn(context, ret, "converting creds");
 	    else {
diff --git a/lib/kafs/afskrb5.c b/lib/kafs/afskrb5.c
index 4a73d74a1..bc732f216 100644
--- a/lib/kafs/afskrb5.c
+++ b/lib/kafs/afskrb5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -65,7 +65,7 @@ get_cred(kafs_data *data, const char *name, const char *inst,
     krb5_free_principal(d->context, in_creds.client);
     if(ret)
 	return ret;
-    ret = krb524_convert_creds_kdc(d->context, d->id, out_creds, c);
+    ret = krb524_convert_creds_kdc_ccache(d->context, d->id, out_creds, c);
     krb5_free_creds(d->context, out_creds);
     return ret;
 }