From: Justin Anderson <jander@mit.edu>
Date: Wed, 29 Nov 2006 21:47:50 +0000 (+0000)
Subject: Accidental commit to 1.6 instead of trunk. Reverting
X-Git-Tag: krb5-1.6-beta1~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ae89eddb1a24cfcf38b02945582ccde343b5782e;p=krb5.git

Accidental commit to 1.6 instead of trunk. Reverting

ticket: 4739
status: open

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

diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c
index ce54b2895..d2a23be96 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc.c
@@ -84,9 +84,9 @@ krb5_cc_ops krb5_cc_stdcc_ops = {
       krb5_stdccv3_remove, 
       krb5_stdccv3_set_flags,
       krb5_stdccv3_get_flags,
-      krb5_stdccv3_ptcursor_new,
-      krb5_stdccv3_ptcursor_next,
-      krb5_stdccv3_ptcursor_free,
+      NULL,
+      NULL,
+      NULL,
       NULL,
       NULL,
       NULL,
@@ -771,135 +771,6 @@ krb5_stdccv3_remove (krb5_context context,
     return cc_err_xlate (err);
 }
 
-static krb5_error_code KRB5_CALLCONV
-krb5_stdccv3_ptcursor_new(krb5_context context,
-                          krb5_cc_ptcursor *cursor)
-{
-	krb5_error_code err = 0;
-	krb5_cc_ptcursor ptcursor = NULL;
-	cc_ccache_iterator_t iterator = NULL;
-	
-	ptcursor = malloc(sizeof(*ptcursor));
-	if (ptcursor == NULL) {
-		err = ENOMEM;
-	}
-	else {
-		memset(ptcursor, 0, sizeof(*ptcursor));
-	}
-	
-	if (!err) {
-		err = stdccv3_setup(context, NULL);
-	}
-	if (!err) {
-		ptcursor->ops = &krb5_cc_stdcc_ops;
-		err = cc_context_new_ccache_iterator(gCntrlBlock, &iterator);
-	}
-	
-	if (!err) {
-		ptcursor->data = iterator;
-	}
-	
-	if (err) {
-		if (ptcursor) { krb5_stdccv3_ptcursor_free(context, &ptcursor); }
-		// krb5_stdccv3_ptcursor_free sets ptcursor to NULL for us
-	}
-	
-	*cursor = ptcursor;
-	
-	return err;
-}
-
-static krb5_error_code KRB5_CALLCONV
-krb5_stdccv3_ptcursor_next(
-    krb5_context context,
-    krb5_cc_ptcursor cursor,
-    krb5_ccache *ccache)
-{
-	krb5_error_code err = 0;
-	cc_ccache_iterator_t iterator = NULL;
-	
-	krb5_ccache newCache = NULL;
-	stdccCacheDataPtr ccapi_data = NULL;
-	cc_ccache_t ccCache = NULL;
-	cc_string_t ccstring = NULL;
-	char *name = NULL;
-	
-	// TODO set proper errors, check context param
-	if (!cursor || !cursor->data) {
-		err = ccErrInvalidContext;
-	}
-	
-	*ccache = NULL;
-	
-	if (!err) {
-	    newCache = (krb5_ccache) malloc (sizeof (*newCache));
-	    if (!newCache) { err = KRB5_CC_NOMEM; }
-	}
-
-	if (!err) {
-	    ccapi_data = (stdccCacheDataPtr) malloc (sizeof (*ccapi_data));
-	    if (!ccapi_data) { err = KRB5_CC_NOMEM; }
-	}
-	
-	if (!err) {
-		iterator = cursor->data;
-		err = cc_ccache_iterator_next(iterator, &ccCache);
-	}
-	
-	if (!err) {
-	    err = cc_ccache_get_name (ccCache, &ccstring);
-	}
-
-	if (!err) {
-	    name = (char *) malloc (sizeof (*name) * (strlen (ccstring->data) + 1));
-	    if (!name) { err = KRB5_CC_NOMEM; }
-	}
-	
-	if (!err) {
-	    strcpy (name, ccstring->data);
-	    ccapi_data->cache_name = name;
-	    name = NULL; /* take ownership */
-    
-	    ccapi_data->NamedCache = ccCache;
-	    ccCache = NULL; /* take ownership */
-    
-	    newCache->ops = &krb5_cc_stdcc_ops;
-	    newCache->data = ccapi_data;
-	    ccapi_data = NULL; /* take ownership */
-    
-	    /* return a pointer to the new cache */
-	    *ccache = newCache;
-	    newCache = NULL;
-	}
- 
-	if (name)       { free (name); }
-	if (ccstring)   { cc_string_release (ccstring); }
-	if (ccCache)    { cc_ccache_release (ccCache); }
-	if (ccapi_data) { free (ccapi_data); }
-	if (newCache)   { free (newCache); }
-	
-	if (err == ccIteratorEnd) {
-		err = ccNoError;
-	}
-	
-	return err;
-}
-
-static krb5_error_code KRB5_CALLCONV
-krb5_stdccv3_ptcursor_free(
-    krb5_context context,
-    krb5_cc_ptcursor *cursor)
-{
-    if (*cursor != NULL) {
-		if ((*cursor)->data != NULL) {
-			cc_ccache_iterator_release((cc_ccache_iterator_t)((*cursor)->data));
-		}
-	    free(*cursor);
-	    *cursor = NULL;
-	}
-    return 0;
-}
-
 #else /* !USE_CCAPI_V3 */
 
 static krb5_error_code stdcc_setup(krb5_context context,
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h
index d548c0531..03948d1a8 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc.h
@@ -87,17 +87,6 @@ krb5_error_code KRB5_CALLCONV krb5_stdccv3_get_flags
 
 krb5_error_code KRB5_CALLCONV krb5_stdccv3_remove 
         (krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds);
-
-static krb5_error_code KRB5_CALLCONV krb5_stdccv3_ptcursor_new
-		(krb5_context context, krb5_cc_ptcursor *cursor);
-
-static krb5_error_code KRB5_CALLCONV krb5_stdccv3_ptcursor_next
-		(krb5_context context, krb5_cc_ptcursor cursor, krb5_ccache *ccache);
-
-static krb5_error_code KRB5_CALLCONV krb5_stdccv3_ptcursor_free
-		(krb5_context context, krb5_cc_ptcursor *cursor);
-
-
 #else
 void krb5_stdcc_shutdown(void);
 
diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index 18d4dc88b..044f48e48 100644
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -53,16 +53,7 @@ extern const krb5_cc_ops krb5_lcc_ops;
 static struct krb5_cc_typelist cc_lcc_entry = { &krb5_lcc_ops, NULL };
 static struct krb5_cc_typelist cc_mcc_entry = { &krb5_mcc_ops, &cc_lcc_entry };
 #else
-
-#ifdef USE_CCAPI_V3
-extern const krb5_cc_ops krb5_cc_stdcc_ops;
-static struct krb5_cc_typelist cc_stdcc_entry = { &krb5_cc_stdcc_ops, NULL };
-static struct krb5_cc_typelist cc_mcc_entry = { &krb5_mcc_ops, &cc_stdcc_entry };
-#else
-
 static struct krb5_cc_typelist cc_mcc_entry = { &krb5_mcc_ops, NULL };
-#endif /* USE_CCAPI_V3 */
-
 #ifdef USE_KEYRING_CCACHE
 static struct krb5_cc_typelist cc_file_entry = { &krb5_cc_file_ops,
 						 &cc_mcc_entry };