Removed calls that destroyed and recreated ccapi_data->NamedCache if it exists in...

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

diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index caadf1c1383c05066a9d4e37ec1a7724f478d9f7..be2bb8f04b72cfa998ab067f23440a0d1764391f 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/ChangeLog
+++ b/src/lib/krb5/ccache/ccapi/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-04  Scott McGuire  <smcguire@mit.edu>
+
+       * stdcc.c (krb5_stdcc_initialize):  Removed calls that destroyed
+          and recreated ccapi_data->NamedCache; instead close
+          and call create on it again.  (This makes sure the data stays
+          in the same cache the whole time so external pointers don't
+          get confused.)
+       
 1999-11-22  Miro Jurisic  <meeroh@mit.edu>
 
        * stdcc.h, stdcc_util.h: use CCache2.h under MacOS for CCAPI v2

diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c
index 36eed9d22b73869110eb10ff8c84cd9a23ba441b..ed233b068fe16ac8a410d82cd341e542a6cc0b45 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/stdcc.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc.c
@@ -331,16 +331,9 @@ krb5_error_code KRB5_CALLCONV  krb5_stdcc_initialize
 
        ccapi_data = id->data;
 
-       if (!ccapi_data->NamedCache) {
-               err = cc_open(gCntrlBlock, ccapi_data->cache_name,
-                             CC_CRED_V5, 0L, 
-                             &ccapi_data->NamedCache);
-               if (err != CC_NOERROR)
-                       ccapi_data->NamedCache = NULL;
-       }
 
        if (ccapi_data->NamedCache)
-               cc_destroy(gCntrlBlock, &ccapi_data->NamedCache);
+               cc_close(gCntrlBlock, &ccapi_data->NamedCache);
 
        err = cc_create(gCntrlBlock, ccapi_data->cache_name, cName,
                        CC_CRED_V5, 0L, &ccapi_data->NamedCache);