pullup from trunk

ticket: 3029
version_fixed: 1.4.2

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17304 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 4c5fa02da04149c70195cb37a15cc0311de49e51..8bbe82cb54440c645253fc27b9ce29bce4009ca1 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -9,6 +9,15 @@
        Wachdorf.  Part of fix for MITKRB5-SA-2005-002 [CAN-2005-1175,
        VU#885830].
 
+2005-04024  Jeffrey Altman <jaltman@mit.edu>
+
+        * get_creds.c: 
+        the purpose of the krb5_get_credentials call is to 
+        obtain a set of credentials for the caller.  the 
+        krb5_cc_store_cred() call is to optimize performance
+        for future calls.  Ignore any errors, since the credentials
+        are still valid even if we fail to store them in the cache.
+        
 2005-03-22  Tom Yu  <tlyu@mit.edu>
 
        * x-deltat.y (wsnum): Add missing semicolon following YYERROR,

diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c
index cb6d8b1e393faea1edea1e441fbc95d654114f02..7dd3ad6c94d319099784911b44523597a7022b0d 100644 (file)
--- a/src/lib/krb5/krb/get_creds.c
+++ b/src/lib/krb5/krb/get_creds.c
@@ -173,8 +173,15 @@ krb5_get_credentials(krb5_context context, krb5_flags options,
        && not_ktype)
        retval = KRB5_CC_NOT_KTYPE;
 
-    if (!retval)
-       retval = krb5_cc_store_cred(context, ccache, *out_creds);
+    if (!retval) {
+        /* the purpose of the krb5_get_credentials call is to 
+         * obtain a set of credentials for the caller.  the 
+         * krb5_cc_store_cred() call is to optimize performance
+         * for future calls.  Ignore any errors, since the credentials
+         * are still valid even if we fail to store them in the cache.
+         */
+       krb5_cc_store_cred(context, ccache, *out_creds);
+    }
     return retval;
 }