Fixed up warnings and whitespace issues which were confusing the

Xcode auto-indenter.

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

13 files changed, 178 insertions, 179 deletions

diff --git a/src/lib/ccapi/client/ccache.c b/src/lib/ccapi/client/ccache.c
index 07e9b8e879..c442a88278 100644
--- a/src/lib/ccapi/client/ccache.c
+++ b/src/lib/ccapi/client/ccache.c
@@ -816,9 +816,10 @@ cc_int_ccache_move( cc_ccache_t source,
     return code;
 }       
 
+cc_int32
 cc_int_ccache_lock( cc_ccache_t ccache,
-                cc_uint32 lock_type,
-                cc_uint32 block )
+                    cc_uint32 lock_type,
+                    cc_uint32 block )
 {
     cc_int_ccache_t 	int_ccache;
     cc_msg_t        	*request = NULL;
@@ -1004,7 +1005,7 @@ cc_int_ccache_get_last_default_time( cc_ccache_t ccache,
 }
 
 cc_int32
-cc_int_ccache_get_change_time( cc_ccache_t ccache, cc_time* time )
+cc_int_ccache_get_change_time( cc_ccache_t ccache, cc_time* change_time )
 {
     cc_int_ccache_t 	int_ccache;
     cc_msg_t        	*request = NULL;
@@ -1049,7 +1050,7 @@ cc_int_ccache_get_change_time( cc_ccache_t ccache, cc_time* time )
         ccmsg_ccache_get_change_time_resp_t * response_header = (ccmsg_ccache_get_change_time_resp_t*)response->header;
         t64 = htonll(response_header->time);
 	/* TODO: validate that we do not overflow 'time' */
-	*time = t64;
+	*change_time = t64;
         code = ccNoError;
     } else {
         code = ccErrBadInternalMessage;
diff --git a/src/lib/ccapi/client/ccache.h b/src/lib/ccapi/client/ccache.h
index 0a92ebf63d..255cf2a421 100644
--- a/src/lib/ccapi/client/ccache.h
+++ b/src/lib/ccapi/client/ccache.h
@@ -114,11 +114,11 @@ cc_int_ccache_unlock( cc_ccache_t ccache );
 
 cc_int32
 cc_int_ccache_get_last_default_time( cc_ccache_t ccache,
-                                cc_time* time );
+                                cc_time* last_default_tim );
 
 cc_int32
 cc_int_ccache_get_change_time( cc_ccache_t ccache,
-                          cc_time* time );
+                          cc_time* change_time );
 
 cc_int32
 cc_int_ccache_compare( cc_ccache_t ccache,
@@ -128,12 +128,12 @@ cc_int_ccache_compare( cc_ccache_t ccache,
 cc_int32	
 cc_int_ccache_get_kdc_time_offset( cc_ccache_t ccache,
                               cc_int32	credentials_version,
-                              cc_time*	time_offset );
+                              cc_time*	kdc_time_offset );
 
 cc_int32
 cc_int_ccache_set_kdc_time_offset( cc_ccache_t ccache,
                               cc_int32	credentials_version,
-                              cc_time	time_offset );
+                              cc_time	kdc_time_offset );
                                 
 cc_int32
 cc_int_ccache_clear_kdc_time_offset( cc_ccache_t	ccache,
diff --git a/src/lib/ccapi/client/context.c b/src/lib/ccapi/client/context.c
index 5d88d46868..4bcfc040c8 100644
--- a/src/lib/ccapi/client/context.c
+++ b/src/lib/ccapi/client/context.c
@@ -154,7 +154,7 @@ cc_int_context_release( cc_context_t context )
 
 cc_int32
 cc_int_context_get_change_time( cc_context_t context,
-                                cc_time* time)
+                                cc_time* change_time)
 {
     cc_int_context_t 		int_context;
     cc_msg_t        		*request = NULL;
@@ -199,7 +199,7 @@ cc_int_context_get_change_time( cc_context_t context,
         response_header = (ccmsg_ctx_get_change_time_resp_t*)response->header;
         t64 = ntohll(response_header->time);
 	/* TODO: validate that value is not greater than can fit in cc_time */
-	*time = (cc_time)t64;
+	*change_time = (cc_time)t64;
         code = ccNoError;
     } else {
         code = ccErrBadInternalMessage;
diff --git a/src/lib/ccapi/client/context.h b/src/lib/ccapi/client/context.h
index 6ff113a269..eb0ea520e3 100644
--- a/src/lib/ccapi/client/context.h
+++ b/src/lib/ccapi/client/context.h
@@ -66,7 +66,7 @@ cc_int_context_release( cc_context_t context );
 
 cc_int32
 cc_int_context_get_change_time( cc_context_t context,
-                                cc_time* time);
+                                cc_time* change_time);
 
 cc_int32
 cc_int_context_get_default_ccache_name( cc_context_t context,
diff --git a/src/lib/ccapi/common/generic_lists.c b/src/lib/ccapi/common/generic_lists.c
index 2c7398313d..62f8d8de40 100644
--- a/src/lib/ccapi/common/generic_lists.c
+++ b/src/lib/ccapi/common/generic_lists.c
@@ -117,7 +117,7 @@ cci_generic_list_new(cc_generic_list_head_t ** listpp)
     if (ret == NULL)

         return ccErrNoMem;

 	

-    ret->type = generic;

+    ret->type = cc_generic_list;

     ret->head = ret->tail = NULL;

     *listpp = ret;

 

diff --git a/src/lib/ccapi/include/CredentialsCache.h b/src/lib/ccapi/include/CredentialsCache.h
index 95c4fe79ba..baad48fe7a 100644
--- a/src/lib/ccapi/include/CredentialsCache.h
+++ b/src/lib/ccapi/include/CredentialsCache.h
@@ -277,219 +277,211 @@ typedef struct cc_credentials_union cc_credentials_union;
 /* Exposed parts */
 
 struct cc_context_d {
-    const cc_context_f*	functions;
+    const cc_context_f *functions;
 #if TARGET_OS_MAC
-    const cc_context_f*	otherFunctions;
+    const cc_context_f *otherFunctions;
 #endif
 };
 typedef struct cc_context_d cc_context_d;
-typedef cc_context_d*	cc_context_t;
+typedef cc_context_d *cc_context_t;
 
 struct cc_ccache_d {
-    const cc_ccache_f*	functions;
+    const cc_ccache_f *functions;
 #if TARGET_OS_MAC
-    const cc_ccache_f*	otherFunctions;
+    const cc_ccache_f *otherFunctions;
 #endif
 };
 typedef struct cc_ccache_d cc_ccache_d;
-typedef cc_ccache_d*	cc_ccache_t;
+typedef cc_ccache_d *cc_ccache_t;
 
 struct cc_ccache_iterator_d {
-    const cc_ccache_iterator_f*	functions;
+    const cc_ccache_iterator_f *functions;
 #if TARGET_OS_MAC
-    const cc_ccache_iterator_f*	otherFunctions;
+    const cc_ccache_iterator_f *otherFunctions;
 #endif
 };
 typedef struct cc_ccache_iterator_d cc_ccache_iterator_d;
-typedef cc_ccache_iterator_d*	cc_ccache_iterator_t;
+typedef cc_ccache_iterator_d *cc_ccache_iterator_t;
 
 struct cc_credentials_iterator_d {
-    const cc_credentials_iterator_f*	functions;
+    const cc_credentials_iterator_f *functions;
 #if TARGET_OS_MAC
-    const cc_credentials_iterator_f*	otherFunctions;
+    const cc_credentials_iterator_f *otherFunctions;
 #endif
 };
 typedef struct cc_credentials_iterator_d cc_credentials_iterator_d;
-typedef cc_credentials_iterator_d*	cc_credentials_iterator_t;
+typedef cc_credentials_iterator_d *cc_credentials_iterator_t;
 
 struct cc_string_d {
-    const char*			data;
-    const cc_string_f*	functions;
+    const char *data;
+    const cc_string_f *functions;
 #if TARGET_OS_MAC
-    const cc_string_f*	otherFunctions;
+    const cc_string_f *otherFunctions;
 #endif
 };
 typedef struct cc_string_d cc_string_d;
-typedef cc_string_d*	cc_string_t;
+typedef cc_string_d *cc_string_t;
 
 struct cc_credentials_d {
-    const cc_credentials_union* data;
-    const cc_credentials_f* functions;
+    const cc_credentials_union *data;
+    const cc_credentials_f *functions;
 #if TARGET_OS_MAC
-    const cc_credentials_f*	otherFunctions;
+    const cc_credentials_f *otherFunctions;
 #endif
 };
 typedef struct cc_credentials_d cc_credentials_d;
-typedef cc_credentials_d* cc_credentials_t;
+typedef cc_credentials_d *cc_credentials_t;
 
 /* Function pointer structs */
 
 struct  cc_context_f {
-    cc_int32    (*release) (
-                                cc_context_t context);
-    cc_int32    (*get_change_time) (
-                                cc_context_t context,
-                                cc_time* time);
-    cc_int32    (*get_default_ccache_name) (
-                                cc_context_t context,
-                                cc_string_t* name);
-    cc_int32    (*open_ccache) (
-                                cc_context_t context,
-                                const char* name,
-                                cc_ccache_t* ccache);
-    cc_int32    (*open_default_ccache) (
-                                cc_context_t context,
-                                cc_ccache_t* ccache);
-    cc_int32    (*create_ccache) (
-                                cc_context_t context,
-                                const char* name,
-                                cc_uint32 cred_vers,
-                                const char* principal, 
-                                cc_ccache_t* ccache);
-    cc_int32    (*create_default_ccache) (
-                                cc_context_t context,
-                                cc_uint32 cred_vers,
-                                const char* principal, 
-                                cc_ccache_t* ccache);
-    cc_int32    (*create_new_ccache) (
-                                cc_context_t context,
-                                cc_uint32 cred_vers,
-                                const char* principal, 
-                                cc_ccache_t* ccache);
-    cc_int32    (*new_ccache_iterator) (
-                                cc_context_t context,
-                                cc_ccache_iterator_t* iterator);
-    cc_int32    (*lock) (
-                                cc_context_t context,
-                                cc_uint32 lock_type,
-                                cc_uint32 block);
-    cc_int32    (*unlock) (
-                                cc_context_t context);
-    cc_int32    (*compare) (
-                                cc_context_t context,
-                                cc_context_t compare_to,
-                                cc_uint32* equal);
+    cc_int32 (*release) (cc_context_t in_context);
+    
+    cc_int32 (*get_change_time) (cc_context_t  in_context,
+                                 cc_time      *out_time);
+    
+    cc_int32 (*get_default_ccache_name) (cc_context_t  in_context,
+                                         cc_string_t  *out_name);
+    
+    cc_int32 (*open_ccache) (cc_context_t  in_context,
+                             const char   *in_name,
+                             cc_ccache_t  *out_ccache);
+    
+    cc_int32 (*open_default_ccache) (cc_context_t  in_context,
+                                     cc_ccache_t  *out_ccache);
+    
+    cc_int32 (*create_ccache) (cc_context_t  in_context,
+                               const char   *in_name,
+                               cc_uint32     in_cred_vers,
+                               const char   *in_principal, 
+                               cc_ccache_t  *out_ccache);
+    
+    cc_int32 (*create_default_ccache) (cc_context_t  in_context,
+                                       cc_uint32     in_cred_vers,
+                                       const char   *in_principal, 
+                                       cc_ccache_t  *out_ccache);
+    
+    cc_int32 (*create_new_ccache) (cc_context_t in_context,
+                                   cc_uint32    in_cred_vers,
+                                   const char  *in_principal, 
+                                   cc_ccache_t *out_ccache);
+    
+    cc_int32 (*new_ccache_iterator) (cc_context_t          in_context,
+                                     cc_ccache_iterator_t *out_iterator);
+    
+    cc_int32 (*lock) (cc_context_t in_context,
+                      cc_uint32    in_lock_type,
+                      cc_uint32    in_block);
+    
+    cc_int32 (*unlock) (cc_context_t in_cc_context);
+    
+    cc_int32 (*compare) (cc_context_t  in_cc_context,
+                         cc_context_t  in_compare_to_context,
+                         cc_uint32    *out_equal);
 };
 
 struct cc_ccache_f {
-    cc_int32    (*release) (
-                                 cc_ccache_t ccache);
-    cc_int32    (*destroy) (
-                                 cc_ccache_t ccache);
-    cc_int32    (*set_default) (
-                                 cc_ccache_t ccache);
-    cc_int32    (*get_credentials_version) (
-                                 cc_ccache_t ccache,
-                                 cc_uint32* credentials_version);
-    cc_int32    (*get_name) (
-                                 cc_ccache_t ccache,
-                                 cc_string_t* name);
-    cc_int32    (*get_principal) (
-                                 cc_ccache_t ccache,
-                                 cc_uint32 credentials_version,
-                                 cc_string_t* principal);
-    cc_int32    (*set_principal) (
-                                 cc_ccache_t ccache,
-                                 cc_uint32 credentials_version,
-                                 const char* principal);
-    cc_int32    (*store_credentials) (
-                                 cc_ccache_t ccache,
-                                 const cc_credentials_union* credentials);
-    cc_int32    (*remove_credentials) (
-                                 cc_ccache_t ccache,
-                                 cc_credentials_t credentials);
-    cc_int32    (*new_credentials_iterator) (
-                                 cc_ccache_t ccache,
-                                 cc_credentials_iterator_t* iterator);
-    cc_int32    (*move) (
-                                 cc_ccache_t source,
-                                 cc_ccache_t destination);
-    cc_int32    (*lock) (
-                                 cc_ccache_t ccache,
-                                 cc_uint32 lock_type,
-                                 cc_uint32 block);
-    cc_int32    (*unlock) (
-                                 cc_ccache_t ccache);
-    cc_int32    (*get_last_default_time) (
-                                 cc_ccache_t ccache,
-                                 cc_time* time);
-    cc_int32    (*get_change_time) (
-                                 cc_ccache_t ccache,
-                                 cc_time* time);
-    cc_int32    (*compare) (
-                                cc_ccache_t ccache,
-                                cc_ccache_t compare_to,
-                                cc_uint32* equal);
-    cc_int32	(*get_kdc_time_offset) (
-                                cc_ccache_t ccache,
-                                cc_int32	credentials_version,
-                                cc_time*	time_offset);
-    cc_int32	(*set_kdc_time_offset) (
-                                cc_ccache_t ccache,
-                                cc_int32	credentials_version,
-                                cc_time	time_offset);
-                                
-    cc_int32	(*clear_kdc_time_offset) (
-                                cc_ccache_t	ccache,
-                                cc_int32	credentials_version);
+    cc_int32 (*release) (cc_ccache_t io_ccache);
+    
+    cc_int32 (*destroy) (cc_ccache_t io_ccache);
+    
+    cc_int32 (*set_default) (cc_ccache_t io_ccache);
+    
+    cc_int32 (*get_credentials_version) (cc_ccache_t  in_ccache,
+                                         cc_uint32   *in_credentials_version);
+    
+    cc_int32 (*get_name) (cc_ccache_t  in_ccache,
+                          cc_string_t *out_name);
+    
+    cc_int32 (*get_principal) (cc_ccache_t  in_ccache,
+                               cc_uint32    in_credentials_version,
+                               cc_string_t *out_principal);
+    
+    cc_int32 (*set_principal) (cc_ccache_t  io_ccache,
+                               cc_uint32    in_credentials_version,
+                               const char  *in_principal);
+    
+    cc_int32 (*store_credentials) (cc_ccache_t                 io_ccache,
+                                   const cc_credentials_union *in_credentials_union);
+    
+    cc_int32 (*remove_credentials) (cc_ccache_t      io_ccache,
+                                    cc_credentials_t in_credentials);
+    
+    cc_int32 (*new_credentials_iterator) (cc_ccache_t                in_ccache,
+                                          cc_credentials_iterator_t *out_credentials_iterator);
+    
+    cc_int32 (*move) (cc_ccache_t io_source_ccache,
+                      cc_ccache_t io_destination_ccache);
+    
+    cc_int32 (*lock) (cc_ccache_t io_ccache,
+                      cc_uint32   in_lock_type,
+                      cc_uint32   in_block);
+    
+    cc_int32 (*unlock) (cc_ccache_t io_ccache);
+    
+    cc_int32 (*get_last_default_time) (cc_ccache_t  in_ccache,
+                                       cc_time     *out_last_default_time);
+    
+    cc_int32 (*get_change_time) (cc_ccache_t  in_ccache,
+                                 cc_time     *out_change_time);
+    
+    cc_int32 (*compare) (cc_ccache_t in_ccache,
+                         cc_ccache_t in_compare_to_ccache,
+                         cc_uint32   *out_equal);
+    
+    cc_int32 (*get_kdc_time_offset) (cc_ccache_t  in_ccache,
+                                     cc_int32     in_credentials_version,
+                                     cc_time     *out_time_offset);
+    
+    cc_int32 (*set_kdc_time_offset) (cc_ccache_t io_ccache,
+                                     cc_int32    in_credentials_version,
+                                     cc_time     in_time_offset);
+    
+    cc_int32 (*clear_kdc_time_offset) (cc_ccache_t in_ccache,
+                                       cc_int32	   in_credentials_version);
 };
 
 struct cc_string_f {
-    cc_int32	(*release) (
-                                cc_string_t string);
+    cc_int32 (*release) (cc_string_t in_string);
 };
 
 struct cc_credentials_f {
-    cc_int32	(*release) (
-                                cc_credentials_t credentials);
-    cc_int32    (*compare) (
-                                cc_credentials_t credentials,
-                                cc_credentials_t compare_to,
-                                cc_uint32* equal);
+    cc_int32 (*release) (cc_credentials_t  io_credentials);
+    
+    cc_int32 (*compare) (cc_credentials_t  in_credentials,
+                         cc_credentials_t  in_compare_to_credentials,
+                         cc_uint32        *out_equal);
 };
 
-			   
+
 struct cc_ccache_iterator_f {
-    cc_int32    (*release) (
-                                 cc_ccache_iterator_t iter);
-    cc_int32    (*next) (
-                                 cc_ccache_iterator_t iter,
-                                 cc_ccache_t* ccache);
-
-    cc_int32 	(*clone) (	 cc_ccache_iterator_t iter,
-				 cc_ccache_iterator_t* new_iter);
+    cc_int32 (*release) (cc_ccache_iterator_t io_ccache_iterator);
+    
+    cc_int32 (*next) (cc_ccache_iterator_t  in_ccache_iterator,
+                      cc_ccache_t          *out_ccache);
+    
+    cc_int32 (*clone) (cc_ccache_iterator_t  in_ccache_iterator,
+                       cc_ccache_iterator_t *out_ccache_iterator);
 };
 
 struct cc_credentials_iterator_f {
-    cc_int32    (*release) (
-                                 cc_credentials_iterator_t iter);
-    cc_int32    (*next) (
-                                 cc_credentials_iterator_t iter,
-                                 cc_credentials_t* cred);
-
-    cc_int32 	(*clone) (	 cc_credentials_iterator_t iter,
-				 cc_credentials_iterator_t* new_iter);
+    cc_int32 (*release) (cc_credentials_iterator_t io_credentials_iterator);
+    
+    cc_int32 (*next) (cc_credentials_iterator_t  in_credentials_iterator,
+                      cc_credentials_t          *out_credentials);
+    
+    cc_int32 (*clone) (cc_credentials_iterator_t  in_credentials_iterator,
+                       cc_credentials_iterator_t *out_credentials_iterator);
 };
 
 /*
  * API functions
  */
- 
-CCACHE_API cc_int32 cc_initialize (
-	cc_context_t*		outContext,
-	cc_int32		inVersion,
-	cc_int32*		outSupportedVersion,
-	char const**		outVendor);
+
+CCACHE_API cc_int32 cc_initialize (cc_context_t  *out_context,
+                                   cc_int32       in_version,
+                                   cc_int32      *out_supported_version,
+                                   char const   **out_vendor);
 	
 /*
  * Convenience macros
diff --git a/src/lib/ccapi/include/CredentialsCache2.h b/src/lib/ccapi/include/CredentialsCache2.h
index 5505bf29fe..b7366273dd 100644
--- a/src/lib/ccapi/include/CredentialsCache2.h
+++ b/src/lib/ccapi/include/CredentialsCache2.h
@@ -307,4 +307,4 @@ CCACHE_API cc_int32 cc_lock_request(
 }
 #endif /* __cplusplus */
 
-#endif /* __CREDENTIALSCACHE2__ */
\ No newline at end of file
+#endif /* __CREDENTIALSCACHE2__ */
diff --git a/src/lib/ccapi/include/generic_lists.h b/src/lib/ccapi/include/generic_lists.h
index 14b7ae28c3..93636da388 100644
--- a/src/lib/ccapi/include/generic_lists.h
+++ b/src/lib/ccapi/include/generic_lists.h
@@ -50,10 +50,10 @@
 #define __CC_GENERIC_LISTS_H_

 

 enum cc_list_type {

-    generic = 0,

-    context,

-    cache,

-    credentials

+    cc_generic_list = 0,

+    cc_context_list,

+    cc_cache_list,

+    cc_credentials_list

 };

 

 struct cc_generic_list_node_t {

diff --git a/src/lib/ccapi/include/msg.h b/src/lib/ccapi/include/msg.h
index 79b9a7f72e..1682811c01 100644
--- a/src/lib/ccapi/include/msg.h
+++ b/src/lib/ccapi/include/msg.h
@@ -68,6 +68,11 @@
 #include "CredentialsCache.h"
 #include "generic_lists.h"
 
+#if TARGET_OS_MAC
+#define htonll(x) OSSwapHostToBigInt64(x)
+#define ntohll(x) OSSwapBigToHostInt64(x)
+#endif
+
 struct  cc_msg_t {
     cc_uint32 type;			/*type of message*/
     cc_uint8 *flat;			/*flattened representation of this message*/
@@ -136,9 +141,9 @@ cc_int32 cci_msg_add_data_blob(cc_msg_t* msg, void *data, cc_uint32 len, cc_uint
 cc_int32 cci_msg_add_header(cc_msg_t* msg, void *header, cc_uint32 header_len);
 cc_int32 cci_msg_calc_blob_pos(cc_msg_t* msg, void *data, cc_uint32 len, cc_uint32 * sizep);
 cc_int32 cci_msg_flatten(cc_msg_t* msg, void **);
-cc_int32 cci_msg_calc_magic(void *flat, int flat_len, cc_uint32 * sizep);
-cc_int32 cci_msg_verify(void* flat, int flat_len, cc_uint32 * sizep);
-cc_int32 cci_msg_unflatten(void *flat, int flat_len, cc_msg_t** msgpp);
+cc_int32 cci_msg_calc_magic(void *flat, cc_uint32 flat_len, cc_uint32 * sizep);
+cc_int32 cci_msg_verify(void* flat, cc_uint32 flat_len, cc_uint32 * sizep);
+cc_int32 cci_msg_unflatten(void *flat, cc_uint32 flat_len, cc_msg_t** msgpp);
 cc_int32 cci_msg_retrieve_blob(cc_msg_t* msg, cc_uint32 blob_offset, cc_uint32 blob_len, char **);
 cc_int32 cci_msg_destroy(cc_msg_t* msg);
 
diff --git a/src/lib/ccapi/mac/CCAPI.xcodeproj/project.pbxproj b/src/lib/ccapi/mac/CCAPI.xcodeproj/project.pbxproj
index 38a73b4c96..912c48b57c 100644
--- a/src/lib/ccapi/mac/CCAPI.xcodeproj/project.pbxproj
+++ b/src/lib/ccapi/mac/CCAPI.xcodeproj/project.pbxproj
@@ -95,7 +95,7 @@
 		A1E70D440A38B5BC007BE3E3 /* NTMakefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NTMakefile; sourceTree = "<group>"; };
 		A1E70D450A38B5BC007BE3E3 /* server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = server.c; sourceTree = "<group>"; };
 		A1E70D460A38B5BC007BE3E3 /* server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = server.c; sourceTree = "<group>"; };
-		A1E70D5D0A38B796007BE3E3 /* CCacheServer.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = CCacheServer.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		A1E70D5D0A38B796007BE3E3 /* CCacheServer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CCacheServer.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A1E70D910A38BB67007BE3E3 /* CCacheServer.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = CCacheServer.plist; sourceTree = "<group>"; };
 		A1E70D920A38BB67007BE3E3 /* CCacheServerInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = CCacheServerInfo.plist; sourceTree = "<group>"; };
 		A1E70D930A38BB67007BE3E3 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
diff --git a/src/lib/ccapi/server/ccs_lists.c b/src/lib/ccapi/server/ccs_lists.c
index 779c17b7a0..5a20c10ab2 100644
--- a/src/lib/ccapi/server/ccs_lists.c
+++ b/src/lib/ccapi/server/ccs_lists.c
@@ -296,7 +296,7 @@ ccs_context_list_new(cc_context_list_head_t ** headpp)
     if (ret == NULL)

         return ccErrNoMem;

     ret->head = ret->tail = NULL;

-	ret->type = context;

+	ret->type = cc_context_list;

     *headpp = ret;

     return ccNoError;

 }

diff --git a/src/lib/ccapi/server/mac/main.c b/src/lib/ccapi/server/mac/main.c
index a9da8da6c8..004e360952 100644
--- a/src/lib/ccapi/server/mac/main.c
+++ b/src/lib/ccapi/server/mac/main.c
@@ -4,14 +4,14 @@
 #include "CredentialsCache.h"
 #include "msg.h"
 #include "migServer.h"
+#include "serv_ops.h"
 
 #include <Kerberos/kipc_server.h>
 
 int main (int argc, const char *argv[])
 {
     cc_int32 code = 0;
-    int running = 1;
-
+    
     openlog (argv[0], LOG_CONS | LOG_PID, LOG_AUTH);
     syslog (LOG_INFO, "Starting up.");   
 
diff --git a/src/lib/ccapi/server/rpc_auth.c b/src/lib/ccapi/server/rpc_auth.c
index 66bc6aee9c..a0af4254f0 100644
--- a/src/lib/ccapi/server/rpc_auth.c
+++ b/src/lib/ccapi/server/rpc_auth.c
@@ -47,6 +47,7 @@
 
 #include "CredentialsCache.h"
 #include "rpc_auth.h"
+#include <string.h>
 
 cc_int32 
 ccs_rpc_is_authorized( cc_auth_info_t* msg_auth, cc_session_info_t* msg_session, cc_auth_info_t* stored_auth,