* acquire_cred.c (acquire_init_cred): Close the ccache if

	krb5_cc_set_flags() fails, as krb5int_cc_default succeeds even if
	the file is not there, but krb5_cc_set_flags will fail in turning
	off OPENCLOSE mode if the file can't be opened.  Thanks to Kent Wu.

ticket: 1656
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15680 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 9cccd9d349db42f82d36fe132a71bc1187cde2e1..814d61c30ffcccb30ac42523089c210879035608 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-10  Tom Yu  <tlyu@mit.edu>
+
+       * acquire_cred.c (acquire_init_cred): Close the ccache if
+       krb5_cc_set_flags() fails, as krb5int_cc_default succeeds even if
+       the file is not there, but krb5_cc_set_flags will fail in turning
+       off OPENCLOSE mode if the file can't be opened.  Thanks to Kent Wu.
+
 2003-06-13  Tom Yu  <tlyu@mit.edu>
 
        * init_sec_context.c (make_ap_req_v1): Free checksum_data if

diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index 2c620b940567fcd6540b2927aca2733c39d66994..27cbab0bb8eb72b4e854490799c71bc4205f05f6 100644 (file)
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -201,6 +201,7 @@ acquire_init_cred(context, minor_status, desired_name, output_princ, cred)
 
    flags = 0;          /* turns off OPENCLOSE mode */
    if ((code = krb5_cc_set_flags(context, ccache, flags))) {
+      (void)krb5_cc_close(context, ccache);
       *minor_status = code;
       return(GSS_S_CRED_UNAVAIL);
    }