svn rev #23896: branches/iakerb/src/ include/krb5/ lib/gssapi/krb5/ lib/krb5/ ...

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23896
Commit By: ghudson
Log Message:
Get rid of krb5_tkt_creds_store_creds() as it is no longer needed.



Changed Files:
U   branches/iakerb/src/include/krb5/krb5.hin
U   branches/iakerb/src/lib/gssapi/krb5/iakerb.c
U   branches/iakerb/src/lib/krb5/krb/gc_frm_kdc.c
U   branches/iakerb/src/lib/krb5/libkrb5.exports
Modified: branches/iakerb/src/include/krb5/krb5.hin
===================================================================
--- branches/iakerb/src/include/krb5/krb5.hin	2010-04-14 03:36:42 UTC (rev 23895)
+++ branches/iakerb/src/include/krb5/krb5.hin	2010-04-14 03:44:01 UTC (rev 23896)
@@ -2473,10 +2473,6 @@
                     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);
 

Modified: branches/iakerb/src/lib/gssapi/krb5/iakerb.c
===================================================================
--- branches/iakerb/src/lib/gssapi/krb5/iakerb.c	2010-04-14 03:36:42 UTC (rev 23895)
+++ branches/iakerb/src/lib/gssapi/krb5/iakerb.c	2010-04-14 03:44:01 UTC (rev 23896)
@@ -623,16 +623,9 @@
                                    &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;
 

Modified: branches/iakerb/src/lib/krb5/krb/gc_frm_kdc.c
===================================================================
--- branches/iakerb/src/lib/krb5/krb/gc_frm_kdc.c	2010-04-14 03:36:42 UTC (rev 23895)
+++ branches/iakerb/src/lib/krb5/krb/gc_frm_kdc.c	2010-04-14 03:44:01 UTC (rev 23896)
@@ -1024,20 +1024,7 @@
     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)
 {

Modified: branches/iakerb/src/lib/krb5/libkrb5.exports
===================================================================
--- branches/iakerb/src/lib/krb5/libkrb5.exports	2010-04-14 03:36:42 UTC (rev 23895)
+++ branches/iakerb/src/lib/krb5/libkrb5.exports	2010-04-14 03:44:01 UTC (rev 23896)
@@ -558,7 +558,6 @@
 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