From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 3 May 2012 21:43:42 +0000 (+0000)
Subject: Make verify_init_creds work with existing ccache
X-Git-Tag: krb5-1.10.4-final~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07e6d05d51aa5e08e36faaa8d8ace00f2b875683;p=thirdparty%2Fkrb5.git

Make verify_init_creds work with existing ccache

As the file ccache implementation currently stands, we don't want to
turn off TC_OPENCLOSE on a file cache we're writing to, or it will be
opened read-only and stores to it will fail.  Reported by Russ
Allbery.

(cherry picked from commit 0ae663d35b7dcbf2c469ad0688a67f4d1c0e425e)

ticket: 7538 (new)
version_fixed: 1.10.4
status: resolved
---

diff --git a/src/lib/krb5/krb/vfy_increds.c b/src/lib/krb5/krb/vfy_increds.c
index 207b3094d5..292ccfb377 100644
--- a/src/lib/krb5/krb/vfy_increds.c
+++ b/src/lib/krb5/krb/vfy_increds.c
@@ -32,8 +32,6 @@ copy_creds_except(krb5_context context, krb5_ccache incc,
     flags = 0;                           /* turns off OPENCLOSE mode */
     if ((code = krb5_cc_set_flags(context, incc, flags)))
         return(code);
-    if ((code = krb5_cc_set_flags(context, outcc, flags)))
-        return(code);
 
     if ((code = krb5_cc_start_seq_get(context, incc, &cur)))
         goto cleanup;
@@ -61,11 +59,6 @@ cleanup:
     else
         code = krb5_cc_set_flags(context, incc, flags);
 
-    if (code)
-        krb5_cc_set_flags(context, outcc, flags);
-    else
-        code = krb5_cc_set_flags(context, outcc, flags);
-
     return(code);
 }