r18022@luminous: jaltman | 2006-05-19 05:18:37 -0400

 Updates of portable CCAPI sources.   All code compiles.
 
 
 r18025@luminous:  jaltman | 2006-05-20 23:48:39 -0400
 Construct an outline of a sample platform specific main.c
 
 Add ccs_serv_cleanup() routine.  Currently does nothing.
 
 Correct field names used within the authorization check.
 
 
 r18026@luminous:  jaltman | 2006-05-22 02:25:43 -0400
 More byte order conversions in the server operations code.
 
 
 
 r18027@luminous:  jaltman | 2006-05-22 13:12:49 -0400
 Source files containing common routines used by both 
 the client and the server.
 
 
 
 r18028@luminous:  jaltman | 2006-05-22 13:17:07 -0400
 Move msg.c and marshall.c to common library.
 
 Add dllmain.c which contains the Windows DllMain() entry 
 point.  This must be moved later to a Windows specific 
 directory.
 
 Cleanup type usage and function name references.  
 
 All that is missing now from the client DLL is a definition
 of cci_perform_rpc() which is the entry point to the IPC
 routine.
 
 
 r18029@luminous:  jaltman | 2006-05-22 13:18:27 -0400
 Move generic list functions to common/generic_lists.c
 so they can be used by both the client dll and the server.
 
 Fix type utilization in serv_ops.c
 
 
 r18083@luminous:  jaltman | 2006-06-05 13:49:34 -0400
 improved error handling
 
 
 r18094@luminous:  jaltman | 2006-06-09 10:42:04 -0400
 * corrections to windows rpc layer
 
 * corrections to network byte order conversions
 
 
 r18095@luminous:  lxs | 2006-06-09 17:46:24 -0400
 cci_msg_retrieve_blob(): changed argument 4 from void** to char** 
 to suppress the warnings from gcc.
 
 r18096@luminous:  lxs | 2006-06-09 17:55:32 -0400
 moved enum cc_list_type to generic_lists.h to avoid "incomplete enum" 
 warnings when compiling generic_lists.c
 
 r18097@luminous:  lxs | 2006-06-09 17:56:15 -0400
 Removed ancient Metrowerks tests from public headers.
 
 r18098@luminous:  lxs | 2006-06-09 17:57:20 -0400
 Include string.h to get memcpy, strlen, etc on BSD OSes.
 
 r18099@luminous:  lxs | 2006-06-09 17:59:36 -0400
 Added Mac OS X project file and Mach-IPC support code
 
 
 r18106@luminous:  jaltman | 2006-06-12 09:56:31 -0400
 remove duplicate header file and obsolete source file
 
 
 r18193@luminous:  jaltman | 2006-06-22 12:57:14 -0400
 This commit updates lib/krb5/ccache/ccapi to support CCAPI Version 3
 and above.  Specify -DUSE_CCAPI_V3=1 when compiling to use CCAPI Version 3
 
 
 r18194@luminous:  jaltman | 2006-06-22 12:58:37 -0400
 Fix parameter name in cc_credentials_iterator_t next()
 
 
 r18195@luminous:  jaltman | 2006-06-22 12:59:08 -0400
 Add missing header
 
 
 r18196@luminous:  jaltman | 2006-06-22 13:11:37 -0400
 Use the old exported names for setup and shutdown
 
 
 r18197@luminous:  jaltman | 2006-06-22 13:18:14 -0400
 krb5_stdccv3_setup is ok
 
 

=== Please enter your commit message above this line ===

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

1 files changed, 54 insertions, 52 deletions

diff --git a/src/lib/ccapi/include/CredentialsCache2.h b/src/lib/ccapi/include/CredentialsCache2.h
index 401e093f43..5505bf29fe 100644
--- a/src/lib/ccapi/include/CredentialsCache2.h
+++ b/src/lib/ccapi/include/CredentialsCache2.h
@@ -1,6 +1,6 @@
 /* $Copyright:
  *
- * Copyright 1998-2004 by the Massachusetts Institute of Technology.
+ * Copyright 1998-2006 by the Massachusetts Institute of Technology.
  * 
  * All rights reserved.
  * 
@@ -48,12 +48,10 @@
 #ifndef __CREDENTIALSCACHE2__
 #define __CREDENTIALSCACHE2__
  
-#include <Kerberos/CredentialsCache.h>
+#include "CredentialsCache.h"
+
 #if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))
-	#include <TargetConditionals.h>
-    #if TARGET_RT_MAC_CFM
-        #error "Use KfM 4.0 SDK headers for CFM compilation."
-    #endif
+#include <TargetConditionals.h>
 #endif
 
 #ifdef __cplusplus
@@ -61,13 +59,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 #if TARGET_OS_MAC
-    #if defined(__MWERKS__)
-        #pragma import on
-        #pragma enumsalwaysint on
-    #endif
-    #pragma options align=mac68k
+#pragma options align=mac68k
 #endif
-
+    
 /* Some old types get directly mapped to new types */
 
 typedef cc_context_d apiCB;
@@ -87,10 +81,10 @@ typedef struct cc_credentials_v5_compat {
     char*			client;
     char*			server;
     cc_data_compat		keyblock;
-    cc_time_t			authtime;
-    cc_time_t			starttime;
-    cc_time_t			endtime;
-    cc_time_t			renew_till;
+    cc_time			authtime;
+    cc_time			starttime;
+    cc_time			endtime;
+    cc_time			renew_till;
     cc_uint32			is_skey;
     cc_uint32			ticket_flags;
     cc_data_compat**	        addresses;
@@ -185,25 +179,32 @@ enum {
     CC_CRED_MAX
 };
 
-cc_int32 cc_shutdown (
+enum {
+    CC_LOCK_UNLOCK = 1,
+    CC_LOCK_READER = 2,
+    CC_LOCK_WRITER = 3,
+    CC_LOCK_NOBLOCK = 16
+};
+
+CCACHE_API cc_int32 cc_shutdown (
         apiCB**				ioContext);
 	
-cc_int32 cc_get_NC_info (
+CCACHE_API cc_int32 cc_get_NC_info (
 	apiCB*				inContext,
 	infoNC***			outInfo);
 	
-cc_int32 cc_get_change_time (
+CCACHE_API cc_int32 cc_get_change_time (
 	apiCB*				inContext,
-	cc_time_t*			outTime);
+	cc_time*			outTime);
 	
-cc_int32 cc_open (
+CCACHE_API cc_int32 cc_open (
 	apiCB*				inContext,
 	const char*			inName,
 	cc_int32			inVersion,
 	cc_uint32			inFlags,
 	ccache_p**			outCCache);
 	
-cc_int32 cc_create (
+CCACHE_API cc_int32 cc_create (
 	apiCB*				inContext,
 	const char*			inName,
 	const char*			inPrincipal,
@@ -211,94 +212,95 @@ cc_int32 cc_create (
 	cc_uint32			inFlags,
 	ccache_p**			outCCache);
 	
-cc_int32 cc_close (
+CCACHE_API cc_int32 cc_close (
 	apiCB*				inContext,
 	ccache_p**			ioCCache);
 	
-cc_int32 cc_destroy (
+CCACHE_API cc_int32 cc_destroy (
 	apiCB*				inContext,
 	ccache_p**			ioCCache);
 	
-cc_int32 cc_seq_fetch_NCs_begin (
+CCACHE_API cc_int32 cc_seq_fetch_NCs_begin (
 	apiCB*				inContext,
-	ccache_cit**		outIterator);
+	ccache_cit**			outIterator);
 
-cc_int32 cc_seq_fetch_NCs_next (
+CCACHE_API cc_int32 cc_seq_fetch_NCs_next (
 	apiCB*				inContext,
 	ccache_p**			outCCache,
 	ccache_cit*			inIterator);
 
-cc_int32 cc_seq_fetch_NCs_end (
+CCACHE_API cc_int32 cc_seq_fetch_NCs_end (
 	apiCB*				inContext,
-	ccache_cit**		ioIterator);
+	ccache_cit**			ioIterator);
 
-cc_int32 cc_get_name (
+CCACHE_API cc_int32 cc_get_name (
 	apiCB*				inContext,
 	ccache_p*			inCCache,
 	char**				outName);
 	
-cc_int32 cc_get_cred_version (
+CCACHE_API cc_int32 cc_get_cred_version (
 	apiCB*				inContext,
 	ccache_p*			inCCache,
 	cc_int32*			outVersion);
 	
-cc_int32 cc_set_principal (
+CCACHE_API cc_int32 cc_set_principal (
 	apiCB*				inContext,
 	ccache_p*			inCCache,
 	cc_int32			inVersion,
 	char*				inPrincipal);
 	
-cc_int32 cc_get_principal (
+CCACHE_API cc_int32 cc_get_principal (
 	apiCB*				inContext,
 	ccache_p*			inCCache,
 	char**				outPrincipal);
 	
-cc_int32 cc_store (
+CCACHE_API cc_int32 cc_store (
 	apiCB*				inContext,
 	ccache_p*			inCCache,
 	cred_union			inCredentials);
 
-cc_int32 cc_remove_cred (
+CCACHE_API cc_int32 cc_remove_cred (
 	apiCB*				inContext,
 	ccache_p*			inCCache,
 	cred_union			inCredentials);
 
-cc_int32 cc_seq_fetch_creds_begin (
+CCACHE_API cc_int32 cc_seq_fetch_creds_begin (
 	apiCB*				inContext,
-	const ccache_p*		inCCache,
-	ccache_cit**		outIterator);
+	const ccache_p*			inCCache,
+	ccache_cit**			outIterator);
 
-cc_int32 cc_seq_fetch_creds_next (
+CCACHE_API cc_int32 cc_seq_fetch_creds_next (
 	apiCB*				inContext,
-	cred_union**		outCreds,
+	cred_union**			outCreds,
 	ccache_cit*			inIterator);
 	
-cc_int32 cc_seq_fetch_creds_end (
+CCACHE_API cc_int32 cc_seq_fetch_creds_end (
 	apiCB*				inContext,
-	ccache_cit**		ioIterator);
+	ccache_cit**			ioIterator);
 	
-cc_int32 cc_free_principal (
+CCACHE_API cc_int32 cc_free_principal (
 	apiCB*				inContext,
 	char**				ioPrincipal);
 
-cc_int32 cc_free_name (
+CCACHE_API cc_int32 cc_free_name (
 	apiCB*				inContext,
 	char**				ioName);
 
-cc_int32 cc_free_creds (
+CCACHE_API cc_int32 cc_free_creds (
 	apiCB*				inContext,
-	cred_union**		creds);
+	cred_union**			creds);
 
-cc_int32 cc_free_NC_info (
+CCACHE_API cc_int32 cc_free_NC_info (
 	apiCB*				inContext,
 	infoNC***			ioInfo);
 	
+CCACHE_API cc_int32 cc_lock_request(
+        apiCB* 				inContext,
+        const ccache_p* 		inCCache,
+        const cc_int32 			lock_type);
+
 #if TARGET_OS_MAC
-    #if defined(__MWERKS__)
-        #pragma enumsalwaysint reset
-        #pragma import reset
-    #endif
-	#pragma options align=reset
+#pragma options align=reset
 #endif
 
 #ifdef __cplusplus