From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 1 May 2014 22:11:32 +0000 (-0400)
Subject: Don't remove ccache creds before storing them
X-Git-Tag: krb5-1.13-alpha1~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7783054742ddd807f7b2f7157d6ed81b7fb614eb;p=thirdparty%2Fkrb5.git

Don't remove ccache creds before storing them

Revert #6291, which attempts to suppress duplicate credentials by
calling krb5_cc_remove in krb5_cc_store_cred.  Most of our ccache
types don't implement remove_cred, and avoiding duplicate credentials
is a responsibility better suited to the ccache implementation for
atomicity reasons.

Removing this call gets rid of the misleading "Removing ... from ..."
messages in trace logs.

ticket: 7906 (new)
---

diff --git a/src/lib/krb5/ccache/ccfns.c b/src/lib/krb5/ccache/ccfns.c
index 1a0bed0acd..1084d51912 100644
--- a/src/lib/krb5/ccache/ccfns.c
+++ b/src/lib/krb5/ccache/ccfns.c
@@ -84,9 +84,6 @@ krb5_cc_store_cred(krb5_context context, krb5_ccache cache,
     krb5_ticket *tkt;
     krb5_principal s1, s2;
 
-    /* remove any dups */
-    krb5_cc_remove_cred(context, cache, KRB5_TC_MATCH_AUTHDATA, creds);
-
     TRACE_CC_STORE(context, cache, creds);
     ret = cache->ops->store(context, cache, creds);
     if (ret) return ret;