From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 14 Apr 2010 03:44:01 +0000 (+0000)
Subject: Get rid of krb5_tkt_creds_store_creds() as it is no longer needed
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ea84d2c723b277a5a8c9c6b73a66924b28cb566;p=thirdparty%2Fkrb5.git

Get rid of krb5_tkt_creds_store_creds() as it is no longer needed

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/iakerb@23896 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 9c32aef584..f94df1e7ef 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -2472,10 +2472,6 @@ krb5_tkt_creds_step(krb5_context context, krb5_tkt_creds_context ctx,
                     krb5_data *in, krb5_data *out, krb5_data *realm,
                     unsigned int *flags);
 
-krb5_error_code KRB5_CALLCONV
-krb5_tkt_creds_store_creds(krb5_context context, krb5_tkt_creds_context ctx,
-                           krb5_ccache ccache);
-
 krb5_error_code KRB5_CALLCONV
 krb5_tkt_creds_get_times(krb5_context context, krb5_tkt_creds_context ctx,
                          krb5_ticket_times *times);
diff --git a/src/lib/gssapi/krb5/iakerb.c b/src/lib/gssapi/krb5/iakerb.c
index 6c6cd3f97e..10d1fdbd6a 100644
--- a/src/lib/gssapi/krb5/iakerb.c
+++ b/src/lib/gssapi/krb5/iakerb.c
@@ -623,16 +623,9 @@ iakerb_initiator_step(iakerb_ctx_id_t ctx,
                                    &out,
                                    &realm,
                                    &flags);
-        if (code != 0) {
-            /* we failed, but store any referrals in our ccache */
-            krb5_tkt_creds_store_creds(ctx->k5c, ctx->u.tcc, NULL);
+        if (code != 0)
             goto cleanup;
-        }
         if ((flags & 1) != 1) {
-            code = krb5_tkt_creds_store_creds(ctx->k5c, ctx->u.tcc, NULL);
-            if (code != 0)
-                goto cleanup;
-
             krb5_tkt_creds_get_times(ctx->k5c, ctx->u.tcc, &times);
             cred->tgt_expire = times.endtime;
 
diff --git a/src/lib/krb5/krb/gc_frm_kdc.c b/src/lib/krb5/krb/gc_frm_kdc.c
index af825beec6..6ebe9869fd 100644
--- a/src/lib/krb5/krb/gc_frm_kdc.c
+++ b/src/lib/krb5/krb/gc_frm_kdc.c
@@ -1024,19 +1024,6 @@ krb5_tkt_creds_get_creds(krb5_context context, krb5_tkt_creds_context ctx,
     return krb5int_copy_creds_contents(context, ctx->reply_creds, creds);
 }
 
-/* Store credentials in credentials cache.  If ccache is NULL, the
- * credentials cache associated with the context is used. */
-krb5_error_code KRB5_CALLCONV
-krb5_tkt_creds_store_creds(krb5_context context, krb5_tkt_creds_context ctx,
-                           krb5_ccache ccache)
-{
-    if (ctx->state != STATE_COMPLETE)
-        return KRB5_NO_TKT_SUPPLIED;
-    if (ccache == NULL)
-        ccache = ctx->ccache;
-    return krb5_cc_store_cred(context, ccache, ctx->reply_creds);
-}
-
 krb5_error_code KRB5_CALLCONV
 krb5_tkt_creds_get_times(krb5_context context, krb5_tkt_creds_context ctx,
                          krb5_ticket_times *times)
diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
index 010ac56287..5c517c89c8 100644
--- a/src/lib/krb5/libkrb5.exports
+++ b/src/lib/krb5/libkrb5.exports
@@ -558,7 +558,6 @@ krb5_tkt_creds_get_creds
 krb5_tkt_creds_get_times
 krb5_tkt_creds_init
 krb5_tkt_creds_step
-krb5_tkt_creds_store_creds
 krb5_timeofday
 krb5_timestamp_to_sfstring
 krb5_timestamp_to_string