From: Tom Yu <tlyu@mit.edu>
Date: Wed, 5 Sep 2007 21:32:27 +0000 (+0000)
Subject: pull up r19910 from trunk
X-Git-Tag: krb5-1.6.3-beta1~18
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8b39ca69def5da56e6e1f080657018642d834aba;p=krb5.git

pull up r19910 from trunk

 r19910@cathode-dark-space:  tlyu | 2007-09-03 22:10:13 -0400
 ticket: 5697

 Bail out if encoded "ticket" doesn't decode correctly.  This allows
 t_cc test case to pass and allows non-tickets to be stored (for now).


ticket: 5697
version_fixed: 1.6.3

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

diff --git a/src/lib/krb5/ccache/ccfns.c b/src/lib/krb5/ccache/ccfns.c
index f44c0fe6c..15bc87df6 100644
--- a/src/lib/krb5/ccache/ccfns.c
+++ b/src/lib/krb5/ccache/ccfns.c
@@ -78,7 +78,8 @@ krb5_cc_store_cred (krb5_context context, krb5_ccache cache,
      */
     s1 = creds->server;
     ret = decode_krb5_ticket(&creds->ticket, &tkt);
-    if (ret) return ret;
+    /* Bail out on errors in case someone is storing a non-ticket. */
+    if (ret) return 0;
     s2 = tkt->server;
     if (!krb5_principal_compare(context, s1, s2)) {
 	creds->server = s2;