Remove orphaned KfM code

Remove the Mac parts of the ccapi code, as ccapi is now only used in
the Windows build.  Remove util/mac.

[ghudson@mit.edu: rewrote commit message]

11 files changed, 0 insertions, 1615 deletions

diff --git a/src/ccapi/common/mac/cci_os_debugging.c b/src/ccapi/common/mac/cci_os_debugging.c
deleted file mode 100644
index e528045..0000000
--- a/src/ccapi/common/mac/cci_os_debugging.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ccapi/common/mac/cci_os_debugging.c */
-/*
- * Copyright 2006 Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-
-#include "cci_os_debugging.h"
-#include <Kerberos/KerberosDebug.h>
-
-/* ------------------------------------------------------------------------ */
-
-void cci_os_debug_vprintf (const char *in_format, va_list in_args)
-{
-    dvprintf (in_format, in_args);
-}
diff --git a/src/ccapi/common/mac/cci_os_identifier.c b/src/ccapi/common/mac/cci_os_identifier.c
deleted file mode 100644
index be7b5bd..0000000
--- a/src/ccapi/common/mac/cci_os_identifier.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ccapi/common/mac/cci_os_identifier.c */
-/*
- * Copyright 2006 Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#include "cci_common.h"
-#include "cci_os_identifier.h"
-
-#include <CoreFoundation/CoreFoundation.h>
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 cci_os_identifier_new_uuid (cci_uuid_string_t *out_uuid_string)
-{
-    cc_int32 err = ccNoError;
-    cci_uuid_string_t uuid_string = NULL;
-    CFUUIDRef uuid = NULL;
-    CFStringRef uuid_stringref = NULL;
-    CFStringEncoding encoding = kCFStringEncodingUTF8;
-    CFIndex length = 0;
-
-    if (!out_uuid_string) { err = cci_check_error (ccErrBadParam); }
-
-    if (!err) {
-        uuid = CFUUIDCreate (kCFAllocatorDefault);
-        if (!uuid) { err = cci_check_error (ccErrNoMem); }
-    }
-
-    if (!err) {
-        uuid_stringref = CFUUIDCreateString (kCFAllocatorDefault, uuid);
-        if (!uuid_stringref) { err = cci_check_error (ccErrNoMem); }
-    }
-
-    if (!err) {
-        length = CFStringGetMaximumSizeForEncoding (CFStringGetLength (uuid_stringref),
-                                                    encoding) + 1;
-
-        uuid_string = malloc (length);
-        if (!uuid_string) { err = cci_check_error (ccErrNoMem); }
-    }
-
-    if (!err) {
-        if (!CFStringGetCString (uuid_stringref, uuid_string, length, encoding)) {
-            err = cci_check_error (ccErrNoMem);
-        }
-    }
-
-    if (!err) {
-        *out_uuid_string = uuid_string;
-        uuid_string = NULL; /* take ownership */
-    }
-
-    if (uuid_string   ) { free (uuid_string); }
-    if (uuid_stringref) { CFRelease (uuid_stringref); }
-    if (uuid          ) { CFRelease (uuid); }
-
-    return cci_check_error (err);
-}
diff --git a/src/ccapi/lib/mac/ccapi_os_ipc.c b/src/ccapi/lib/mac/ccapi_os_ipc.c
deleted file mode 100644
index d6b9a6c..0000000
--- a/src/ccapi/lib/mac/ccapi_os_ipc.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ccapi/lib/mac/ccapi_os_ipc.c */
-/*
- * Copyright 2006 Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#include "ccapi_os_ipc.h"
-
-#include "k5_mig_client.h"
-
-#define cci_server_bundle_id "edu.mit.Kerberos.CCacheServer"
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 cci_os_ipc_thread_init (void)
-{
-    /* k5_ipc_send_request handles all thread data for us */
-    return 0;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 cci_os_ipc (cc_int32      in_launch_server,
-                     k5_ipc_stream in_request_stream,
-                     k5_ipc_stream *out_reply_stream)
-{
-    return cci_check_error (k5_ipc_send_request (cci_server_bundle_id,
-                                                 in_launch_server,
-                                                 in_request_stream,
-                                                 out_reply_stream));
-}
diff --git a/src/ccapi/lib/mac/ccapi_vector.c b/src/ccapi/lib/mac/ccapi_vector.c
deleted file mode 100644
index 155599d..0000000
--- a/src/ccapi/lib/mac/ccapi_vector.c
+++ /dev/null
@@ -1,838 +0,0 @@
-/* ccapi/lib/mac/ccapi_vector.c */
-/*
- * Copyright 2006 Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#include "ccapi_vector.h"
-
-#include "ccapi_context.h"
-#include "ccapi_string.h"
-#include "ccapi_ccache.h"
-#include "ccapi_credentials.h"
-#include "ccapi_ccache_iterator.h"
-#include "ccapi_credentials_iterator.h"
-
-/* ------------------------------------------------------------------------ */
-
-static void cci_swap_string_functions (cc_string_t io_string)
-{
-    cc_string_f temp = *(io_string->functions);
-    *((cc_string_f *)io_string->functions) = *(io_string->vector_functions);
-    *((cc_string_f *)io_string->vector_functions) = temp;
-}
-
-/* ------------------------------------------------------------------------ */
-
-static void cci_swap_context_functions (cc_context_t io_context)
-{
-    cc_context_f temp = *(io_context->functions);
-    *((cc_context_f *)io_context->functions) = *(io_context->vector_functions);
-    *((cc_context_f *)io_context->vector_functions) = temp;
-}
-
-/* ------------------------------------------------------------------------ */
-
-static void cci_swap_ccache_functions (cc_ccache_t io_ccache)
-{
-    cc_ccache_f temp = *(io_ccache->functions);
-    *((cc_ccache_f *)io_ccache->functions) = *(io_ccache->vector_functions);
-    *((cc_ccache_f *)io_ccache->vector_functions) = temp;
-}
-
-/* ------------------------------------------------------------------------ */
-
-static void cci_swap_credentials_functions (cc_credentials_t io_credentials)
-{
-    cc_credentials_f temp = *(io_credentials->functions);
-    *((cc_credentials_f *)io_credentials->functions) = *(io_credentials->otherFunctions);
-    *((cc_credentials_f *)io_credentials->otherFunctions) = temp;
-}
-
-/* ------------------------------------------------------------------------ */
-
-static void cci_swap_ccache_iterator_functions (cc_ccache_iterator_t io_ccache_iterator)
-{
-    cc_ccache_iterator_f temp = *(io_ccache_iterator->functions);
-    *((cc_ccache_iterator_f *)io_ccache_iterator->functions) = *(io_ccache_iterator->vector_functions);
-    *((cc_ccache_iterator_f *)io_ccache_iterator->vector_functions) = temp;
-}
-
-/* ------------------------------------------------------------------------ */
-
-static void cci_swap_credentials_iterator_functions (cc_credentials_iterator_t io_credentials_iterator)
-{
-    cc_credentials_iterator_f temp = *(io_credentials_iterator->functions);
-    *((cc_credentials_iterator_f *)io_credentials_iterator->functions) = *(io_credentials_iterator->vector_functions);
-    *((cc_credentials_iterator_f *)io_credentials_iterator->vector_functions) = temp;
-}
-
-#pragma mark -
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_initialize_vector (cc_context_t  *out_context,
-                                 cc_int32       in_version,
-                                 cc_int32      *out_supported_version,
-                                 char const   **out_vendor)
-{
-    return cc_initialize (out_context, in_version, out_supported_version, out_vendor);
-}
-
-#pragma mark -
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_string_release_vector (cc_string_t in_string)
-{
-    cci_swap_string_functions (in_string);
-    return ccapi_string_release (in_string);
-}
-
-#pragma mark -
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_release_vector (cc_context_t io_context)
-{
-    cci_swap_context_functions (io_context);
-    return ccapi_context_release (io_context);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_get_change_time_vector (cc_context_t  in_context,
-                                              cc_time_t    *out_change_time)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_get_change_time (in_context, out_change_time);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_get_default_ccache_name_vector (cc_context_t  in_context,
-                                                      cc_string_t  *out_name)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_get_default_ccache_name (in_context, out_name);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_open_ccache_vector (cc_context_t  in_context,
-                                          const char   *in_name,
-                                          cc_ccache_t  *out_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_open_ccache (in_context, in_name, out_ccache);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_open_default_ccache_vector (cc_context_t  in_context,
-                                                  cc_ccache_t  *out_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_open_default_ccache (in_context, out_ccache);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_create_ccache_vector (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 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_create_ccache (in_context, in_name, in_cred_vers, in_principal, out_ccache);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_create_default_ccache_vector (cc_context_t  in_context,
-                                                    cc_uint32     in_cred_vers,
-                                                    const char   *in_principal,
-                                                    cc_ccache_t  *out_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_create_default_ccache (in_context, in_cred_vers, in_principal, out_ccache);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_create_new_ccache_vector (cc_context_t in_context,
-                                                cc_uint32    in_cred_vers,
-                                                const char  *in_principal,
-                                                cc_ccache_t *out_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_create_new_ccache (in_context, in_cred_vers, in_principal, out_ccache);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_new_ccache_iterator_vector (cc_context_t          in_context,
-                                                  cc_ccache_iterator_t *out_iterator)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_new_ccache_iterator (in_context, out_iterator);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_lock_vector (cc_context_t in_context,
-                                   cc_uint32    in_lock_type,
-                                   cc_uint32    in_block)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_lock (in_context, in_lock_type, in_block);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_unlock_vector (cc_context_t in_context)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_unlock (in_context);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_context_compare_vector (cc_context_t  in_context,
-                                      cc_context_t  in_compare_to_context,
-                                      cc_uint32    *out_equal)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = ccapi_context_compare (in_context, in_compare_to_context, out_equal);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-#pragma mark -
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_release_vector (cc_ccache_t io_ccache)
-{
-    cci_swap_ccache_functions (io_ccache);
-    return ccapi_ccache_release (io_ccache);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_destroy_vector (cc_ccache_t io_ccache)
-{
-    cci_swap_ccache_functions (io_ccache);
-    return ccapi_ccache_destroy (io_ccache);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_set_default_vector (cc_ccache_t io_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (io_ccache);
-    err = ccapi_ccache_set_default (io_ccache);
-    cci_swap_ccache_functions (io_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_uint32 __cc_ccache_get_credentials_version_vector (cc_ccache_t  in_ccache,
-                                                      cc_uint32   *out_credentials_version)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (in_ccache);
-    err = ccapi_ccache_get_credentials_version (in_ccache, out_credentials_version);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_get_name_vector (cc_ccache_t  in_ccache,
-                                      cc_string_t *out_name)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (in_ccache);
-    err = ccapi_ccache_get_name (in_ccache, out_name);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_get_principal_vector (cc_ccache_t  in_ccache,
-                                           cc_uint32    in_credentials_version,
-                                           cc_string_t *out_principal)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (in_ccache);
-    err = ccapi_ccache_get_principal (in_ccache, in_credentials_version, out_principal);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_set_principal_vector (cc_ccache_t  io_ccache,
-                                           cc_uint32    in_credentials_version,
-                                           const char  *in_principal)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (io_ccache);
-    err = ccapi_ccache_set_principal (io_ccache, in_credentials_version, in_principal);
-    cci_swap_ccache_functions (io_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_store_credentials_vector (cc_ccache_t                 io_ccache,
-                                               const cc_credentials_union *in_credentials_union)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (io_ccache);
-    err = ccapi_ccache_store_credentials (io_ccache, in_credentials_union);
-    cci_swap_ccache_functions (io_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_remove_credentials_vector (cc_ccache_t      io_ccache,
-                                                cc_credentials_t in_credentials)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (io_ccache);
-    cci_swap_credentials_functions (in_credentials);
-    err = ccapi_ccache_remove_credentials (io_ccache, in_credentials);
-    cci_swap_ccache_functions (io_ccache);
-    cci_swap_credentials_functions (in_credentials);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_new_credentials_iterator_vector (cc_ccache_t                in_ccache,
-                                                      cc_credentials_iterator_t *out_credentials_iterator)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (in_ccache);
-    err = ccapi_ccache_new_credentials_iterator (in_ccache, out_credentials_iterator);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_move_vector (cc_ccache_t io_source_ccache,
-                                  cc_ccache_t io_destination_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (io_source_ccache);
-    cci_swap_ccache_functions (io_destination_ccache);
-    err = ccapi_ccache_move (io_source_ccache, io_destination_ccache);
-    cci_swap_ccache_functions (io_source_ccache);
-    cci_swap_ccache_functions (io_destination_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_lock_vector (cc_ccache_t io_ccache,
-                                  cc_uint32   in_lock_type,
-                                  cc_uint32   in_block)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (io_ccache);
-    err = ccapi_ccache_lock (io_ccache, in_lock_type, in_block);
-    cci_swap_ccache_functions (io_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_unlock_vector (cc_ccache_t io_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (io_ccache);
-    err = ccapi_ccache_unlock (io_ccache);
-    cci_swap_ccache_functions (io_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_get_last_default_time_vector (cc_ccache_t  in_ccache,
-                                                   cc_time_t   *out_last_default_time)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (in_ccache);
-    err = ccapi_ccache_get_last_default_time (in_ccache, out_last_default_time);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_get_change_time_vector (cc_ccache_t  in_ccache,
-                                             cc_time_t   *out_change_time)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (in_ccache);
-    err = ccapi_ccache_get_change_time (in_ccache, out_change_time);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_compare_vector (cc_ccache_t  in_ccache,
-                                     cc_ccache_t  in_compare_to_ccache,
-                                     cc_uint32   *out_equal)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_functions (in_ccache);
-    cci_swap_ccache_functions (in_compare_to_ccache);
-    err = ccapi_ccache_compare (in_ccache, in_compare_to_ccache, out_equal);
-    cci_swap_ccache_functions (in_ccache);
-    cci_swap_ccache_functions (in_compare_to_ccache);
-    return err;
-}
-
-#pragma mark -
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_credentials_release_vector (cc_credentials_t io_credentials)
-{
-    cci_swap_credentials_functions (io_credentials);
-    return ccapi_credentials_release (io_credentials);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_credentials_compare_vector (cc_credentials_t  in_credentials,
-                                          cc_credentials_t  in_compare_to_credentials,
-                                          cc_uint32        *out_equal)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_credentials_functions (in_credentials);
-    cci_swap_credentials_functions (in_compare_to_credentials);
-    err = ccapi_credentials_compare (in_credentials, in_compare_to_credentials, out_equal);
-    cci_swap_credentials_functions (in_credentials);
-    cci_swap_credentials_functions (in_compare_to_credentials);
-    return err;
-}
-
-#pragma mark -
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_iterator_release_vector (cc_ccache_iterator_t io_ccache_iterator)
-{
-    cci_swap_ccache_iterator_functions (io_ccache_iterator);
-    return ccapi_ccache_iterator_release (io_ccache_iterator);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_ccache_iterator_next_vector (cc_ccache_iterator_t  in_ccache_iterator,
-                                           cc_ccache_t          *out_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_ccache_iterator_functions (in_ccache_iterator);
-    err = ccapi_ccache_iterator_next (in_ccache_iterator, out_ccache);
-    cci_swap_ccache_iterator_functions (in_ccache_iterator);
-    return err;
-}
-
-#pragma mark -
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_credentials_iterator_release_vector (cc_credentials_iterator_t io_credentials_iterator)
-{
-    cci_swap_credentials_iterator_functions (io_credentials_iterator);
-    return ccapi_credentials_iterator_release (io_credentials_iterator);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_credentials_iterator_next_vector (cc_credentials_iterator_t  in_credentials_iterator,
-                                                cc_credentials_t          *out_credentials)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_credentials_iterator_functions (in_credentials_iterator);
-    err = ccapi_credentials_iterator_next (in_credentials_iterator, out_credentials);
-    cci_swap_credentials_iterator_functions (in_credentials_iterator);
-    return err;
-}
-
-#pragma mark -
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_shutdown_vector (apiCB **io_context)
-{
-    cci_swap_context_functions (*io_context);
-    return cc_shutdown (io_context);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_get_NC_info_vector (apiCB    *in_context,
-                                  infoNC ***out_info)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = cc_get_NC_info (in_context, out_info);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_get_change_time_vector (apiCB     *in_context,
-                                      cc_time_t *out_change_time)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = cc_get_change_time (in_context, out_change_time);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_open_vector (apiCB       *in_context,
-                           const char  *in_name,
-                           cc_int32     in_version,
-                           cc_uint32    in_flags,
-                           ccache_p   **out_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = cc_open (in_context, in_name, in_version, in_flags, out_ccache);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_create_vector (apiCB       *in_context,
-                             const char  *in_name,
-                             const char  *in_principal,
-                             cc_int32     in_version,
-                             cc_uint32    in_flags,
-                             ccache_p   **out_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = cc_create (in_context, in_name, in_principal, in_version, in_flags, out_ccache);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_close_vector (apiCB     *in_context,
-                            ccache_p **io_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (*io_ccache);
-    err = cc_close (in_context, io_ccache);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_destroy_vector (apiCB     *in_context,
-                              ccache_p **io_ccache)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (*io_ccache);
-    err = cc_destroy (in_context, io_ccache);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_seq_fetch_NCs_begin_vector (apiCB       *in_context,
-                                          ccache_cit **out_iterator)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = cc_seq_fetch_NCs_begin (in_context, out_iterator);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_seq_fetch_NCs_next_vector (apiCB       *in_context,
-                                         ccache_p   **out_ccache,
-                                         ccache_cit  *in_iterator)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_iterator_functions ((ccache_cit_ccache *)in_iterator);
-    err = cc_seq_fetch_NCs_next (in_context, out_ccache, in_iterator);
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_iterator_functions ((ccache_cit_ccache *)in_iterator);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_seq_fetch_NCs_end_vector (apiCB       *in_context,
-                                        ccache_cit **io_iterator)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_iterator_functions ((ccache_cit_ccache *) *io_iterator);
-    err = cc_seq_fetch_NCs_end (in_context, io_iterator);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_get_name_vector (apiCB     *in_context,
-                               ccache_p  *in_ccache,
-                               char     **out_name)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (in_ccache);
-    err = cc_get_name (in_context, in_ccache, out_name);
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_get_cred_version_vector (apiCB    *in_context,
-                                       ccache_p *in_ccache,
-                                       cc_int32 *out_version)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (in_ccache);
-    err = cc_get_cred_version (in_context, in_ccache, out_version);
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_set_principal_vector (apiCB    *in_context,
-                                    ccache_p *io_ccache,
-                                    cc_int32  in_version,
-                                    char     *in_principal)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (io_ccache);
-    err = cc_set_principal (in_context, io_ccache, in_version, in_principal);
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (io_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_get_principal_vector (apiCB      *in_context,
-                                    ccache_p   *in_ccache,
-                                    char      **out_principal)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (in_ccache);
-    err = cc_get_principal (in_context, in_ccache, out_principal);
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_store_vector (apiCB      *in_context,
-                            ccache_p   *io_ccache,
-                            cred_union  in_credentials)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (io_ccache);
-    err = cc_store (in_context, io_ccache, in_credentials);
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (io_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_remove_cred_vector (apiCB      *in_context,
-                                  ccache_p   *in_ccache,
-                                  cred_union  in_credentials)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (in_ccache);
-    err = cc_remove_cred (in_context, in_ccache, in_credentials);
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions (in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_seq_fetch_creds_begin_vector (apiCB           *in_context,
-                                            const ccache_p  *in_ccache,
-                                            ccache_cit     **out_iterator)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions ((ccache_p *)in_ccache);
-    err = cc_seq_fetch_creds_begin (in_context, in_ccache, out_iterator);
-    cci_swap_context_functions (in_context);
-    cci_swap_ccache_functions ((ccache_p *)in_ccache);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_seq_fetch_creds_next_vector (apiCB       *in_context,
-                                           cred_union **out_creds,
-                                           ccache_cit  *in_iterator)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_credentials_iterator_functions ((ccache_cit_creds *)in_iterator);
-    err = cc_seq_fetch_creds_next (in_context, out_creds, in_iterator);
-    cci_swap_context_functions (in_context);
-    cci_swap_credentials_iterator_functions ((ccache_cit_creds *)in_iterator);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_seq_fetch_creds_end_vector (apiCB       *in_context,
-                                          ccache_cit **io_iterator)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    cci_swap_credentials_iterator_functions ((ccache_cit_creds *) *io_iterator);
-    err = cc_seq_fetch_creds_end (in_context, io_iterator);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_free_principal_vector (apiCB  *in_context,
-                                     char  **io_principal)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = cc_free_principal (in_context, io_principal);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_free_name_vector (apiCB  *in_context,
-                                char  **io_name)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = cc_free_name (in_context, io_name);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_free_creds_vector (apiCB       *in_context,
-                                 cred_union **io_credentials)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = cc_free_creds (in_context, io_credentials);
-    cci_swap_context_functions (in_context);
-    return err;
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 __cc_free_NC_info_vector (apiCB    *in_context,
-                                   infoNC ***io_info)
-{
-    cc_int32 err = ccNoError;
-    cci_swap_context_functions (in_context);
-    err = cc_free_NC_info (in_context, io_info);
-    cci_swap_context_functions (in_context);
-    return err;
-}
diff --git a/src/ccapi/lib/mac/ccapi_vector.exports b/src/ccapi/lib/mac/ccapi_vector.exports
deleted file mode 100644
index 0f02e41..0000000
--- a/src/ccapi/lib/mac/ccapi_vector.exports
+++ /dev/null
@@ -1,59 +0,0 @@
-__cc_context_release_vector
-__cc_context_get_change_time_vector
-__cc_context_get_default_ccache_name_vector
-__cc_context_open_ccache_vector
-__cc_context_open_default_ccache_vector
-__cc_context_create_ccache_vector
-__cc_context_create_default_ccache_vector
-__cc_context_create_new_ccache_vector
-__cc_context_new_ccache_iterator_vector
-__cc_context_lock_vector
-__cc_context_unlock_vector
-__cc_context_compare_vector
-__cc_ccache_release_vector
-__cc_ccache_destroy_vector
-__cc_ccache_set_default_vector
-__cc_ccache_get_credentials_version_vector
-__cc_ccache_get_name_vector
-__cc_ccache_get_principal_vector
-__cc_ccache_set_principal_vector
-__cc_ccache_store_credentials_vector
-__cc_ccache_remove_credentials_vector
-__cc_ccache_new_credentials_iterator_vector
-__cc_ccache_move_vector
-__cc_ccache_lock_vector
-__cc_ccache_unlock_vector
-__cc_ccache_get_last_default_time_vector
-__cc_ccache_get_change_time_vector
-__cc_ccache_compare_vector
-__cc_string_release_vector
-__cc_credentials_release_vector
-__cc_credentials_compare_vector
-__cc_ccache_iterator_release_vector
-__cc_ccache_iterator_next_vector
-__cc_credentials_iterator_release_vector
-__cc_credentials_iterator_next_vector
-__cc_initialize_vector
-__cc_shutdown_vector
-__cc_get_NC_info_vector
-__cc_get_change_time_vector
-__cc_open_vector
-__cc_create_vector
-__cc_close_vector
-__cc_destroy_vector
-__cc_seq_fetch_NCs_begin_vector
-__cc_seq_fetch_NCs_next_vector
-__cc_seq_fetch_NCs_end_vector
-__cc_get_name_vector
-__cc_get_cred_version_vector
-__cc_set_principal_vector
-__cc_get_principal_vector
-__cc_store_vector
-__cc_remove_cred_vector
-__cc_seq_fetch_creds_begin_vector
-__cc_seq_fetch_creds_next_vector
-__cc_seq_fetch_creds_end_vector
-__cc_free_principal_vector
-__cc_free_name_vector
-__cc_free_creds_vector
-__cc_free_NC_info_vector
diff --git a/src/ccapi/lib/mac/ccapi_vector.h b/src/ccapi/lib/mac/ccapi_vector.h
deleted file mode 100644
index 803257c..0000000
--- a/src/ccapi/lib/mac/ccapi_vector.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* ccapi/lib/mac/ccapi_vector.h */
-/*
- * Copyright 2006 Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#include <CredentialsCache2.h>
-
-
-cc_int32 __cc_initialize_vector (cc_context_t  *out_context,
-                                 cc_int32       in_version,
-                                 cc_int32      *out_supported_version,
-                                 char const   **out_vendor);
-
-cc_int32 __cc_string_release_vector (cc_string_t in_string);
-
-cc_int32 __cc_context_release_vector (cc_context_t io_context);
-
-cc_int32 __cc_context_get_change_time_vector (cc_context_t  in_context,
-                                              cc_time_t    *out_change_time);
-
-cc_int32 __cc_context_get_default_ccache_name_vector (cc_context_t  in_context,
-                                                      cc_string_t  *out_name);
-
-cc_int32 __cc_context_open_ccache_vector (cc_context_t  in_context,
-                                          const char   *in_name,
-                                          cc_ccache_t  *out_ccache);
-
-cc_int32 __cc_context_open_default_ccache_vector (cc_context_t  in_context,
-                                                  cc_ccache_t  *out_ccache);
-
-cc_int32 __cc_context_create_ccache_vector (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 __cc_context_create_default_ccache_vector (cc_context_t  in_context,
-                                                    cc_uint32     in_cred_vers,
-                                                    const char   *in_principal,
-                                                    cc_ccache_t  *out_ccache);
-
-cc_int32 __cc_context_create_new_ccache_vector (cc_context_t in_context,
-                                                cc_uint32    in_cred_vers,
-                                                const char  *in_principal,
-                                                cc_ccache_t *out_ccache);
-
-cc_int32 __cc_context_new_ccache_iterator_vector (cc_context_t          in_context,
-                                                  cc_ccache_iterator_t *out_iterator);
-
-cc_int32 __cc_context_lock_vector (cc_context_t in_context,
-                                   cc_uint32    in_lock_type,
-                                   cc_uint32    in_block);
-
-cc_int32 __cc_context_unlock_vector (cc_context_t in_context);
-
-cc_int32 __cc_context_compare_vector (cc_context_t  in_context,
-                                      cc_context_t  in_compare_to_context,
-                                      cc_uint32    *out_equal);
-
-cc_int32 __cc_ccache_release_vector (cc_ccache_t io_ccache);
-
-cc_int32 __cc_ccache_destroy_vector (cc_ccache_t io_ccache);
-
-cc_int32 __cc_ccache_set_default_vector (cc_ccache_t io_ccache);
-
-cc_uint32 __cc_ccache_get_credentials_version_vector (cc_ccache_t  in_ccache,
-                                                      cc_uint32   *out_credentials_version);
-
-cc_int32 __cc_ccache_get_name_vector (cc_ccache_t  in_ccache,
-                                      cc_string_t *out_name);
-
-cc_int32 __cc_ccache_get_principal_vector (cc_ccache_t  in_ccache,
-                                           cc_uint32    in_credentials_version,
-                                           cc_string_t *out_principal);
-
-cc_int32 __cc_ccache_set_principal_vector (cc_ccache_t  io_ccache,
-                                           cc_uint32    in_credentials_version,
-                                           const char  *in_principal);
-
-cc_int32 __cc_ccache_store_credentials_vector (cc_ccache_t                 io_ccache,
-                                               const cc_credentials_union *in_credentials_union);
-
-cc_int32 __cc_ccache_remove_credentials_vector (cc_ccache_t      io_ccache,
-                                                cc_credentials_t in_credentials);
-
-cc_int32 __cc_ccache_new_credentials_iterator_vector (cc_ccache_t                in_ccache,
-                                                      cc_credentials_iterator_t *out_credentials_iterator);
-
-cc_int32 __cc_ccache_move_vector (cc_ccache_t io_source_ccache,
-                                  cc_ccache_t io_destination_ccache);
-
-cc_int32 __cc_ccache_lock_vector (cc_ccache_t io_ccache,
-                                  cc_uint32   in_lock_type,
-                                  cc_uint32   in_block);
-
-cc_int32 __cc_ccache_unlock_vector (cc_ccache_t io_ccache);
-
-cc_int32 __cc_ccache_get_last_default_time_vector (cc_ccache_t  in_ccache,
-                                                   cc_time_t   *out_last_default_time);
-
-cc_int32 __cc_ccache_get_change_time_vector (cc_ccache_t  in_ccache,
-                                             cc_time_t   *out_change_time);
-
-cc_int32 __cc_ccache_compare_vector (cc_ccache_t  in_ccache,
-                                     cc_ccache_t  in_compare_to_ccache,
-                                     cc_uint32   *out_equal);
-
-cc_int32 __cc_credentials_release_vector (cc_credentials_t io_credentials);
-
-cc_int32 __cc_credentials_compare_vector (cc_credentials_t  in_credentials,
-                                          cc_credentials_t  in_compare_to_credentials,
-                                          cc_uint32        *out_equal);
-
-cc_int32 __cc_ccache_iterator_release_vector (cc_ccache_iterator_t io_ccache_iterator);
-
-cc_int32 __cc_ccache_iterator_next_vector (cc_ccache_iterator_t  in_ccache_iterator,
-                                           cc_ccache_t          *out_ccache);
-
-cc_int32 __cc_credentials_iterator_release_vector (cc_credentials_iterator_t io_credentials_iterator);
-
-cc_int32 __cc_credentials_iterator_next_vector (cc_credentials_iterator_t  in_credentials_iterator,
-                                                cc_credentials_t          *out_credentials);
-
-cc_int32 __cc_shutdown_vector (apiCB **io_context);
-
-cc_int32 __cc_get_NC_info_vector (apiCB    *in_context,
-                                  infoNC ***out_info);
-
-cc_int32 __cc_get_change_time_vector (apiCB     *in_context,
-                                      cc_time_t *out_change_time);
-
-cc_int32 __cc_open_vector (apiCB       *in_context,
-                           const char  *in_name,
-                           cc_int32     in_version,
-                           cc_uint32    in_flags,
-                           ccache_p   **out_ccache);
-
-cc_int32 __cc_create_vector (apiCB       *in_context,
-                             const char  *in_name,
-                             const char  *in_principal,
-                             cc_int32     in_version,
-                             cc_uint32    in_flags,
-                             ccache_p   **out_ccache);
-
-cc_int32 __cc_close_vector (apiCB     *in_context,
-                            ccache_p **io_ccache);
-
-cc_int32 __cc_destroy_vector (apiCB     *in_context,
-                              ccache_p **io_ccache);
-
-cc_int32 __cc_seq_fetch_NCs_begin_vector (apiCB       *in_context,
-                                          ccache_cit **out_iterator);
-
-cc_int32 __cc_seq_fetch_NCs_next_vector (apiCB       *in_context,
-                                         ccache_p   **out_ccache,
-                                         ccache_cit  *in_iterator);
-
-cc_int32 __cc_seq_fetch_NCs_end_vector (apiCB       *in_context,
-                                        ccache_cit **io_iterator);
-
-cc_int32 __cc_get_name_vector (apiCB     *in_context,
-                               ccache_p  *in_ccache,
-                               char     **out_name);
-
-cc_int32 __cc_get_cred_version_vector (apiCB    *in_context,
-                                       ccache_p *in_ccache,
-                                       cc_int32 *out_version);
-
-cc_int32 __cc_set_principal_vector (apiCB    *in_context,
-                                    ccache_p *io_ccache,
-                                    cc_int32  in_version,
-                                    char     *in_principal);
-
-cc_int32 __cc_get_principal_vector (apiCB      *in_context,
-                                    ccache_p   *in_ccache,
-                                    char      **out_principal);
-
-cc_int32 __cc_store_vector (apiCB      *in_context,
-                            ccache_p   *io_ccache,
-                            cred_union  in_credentials);
-
-cc_int32 __cc_remove_cred_vector (apiCB      *in_context,
-                                  ccache_p   *in_ccache,
-                                  cred_union  in_credentials);
-
-cc_int32 __cc_seq_fetch_creds_begin_vector (apiCB           *in_context,
-                                            const ccache_p  *in_ccache,
-                                            ccache_cit     **out_iterator);
-
-cc_int32 __cc_seq_fetch_creds_next_vector (apiCB       *in_context,
-                                           cred_union **out_creds,
-                                           ccache_cit  *in_iterator);
-
-cc_int32 __cc_seq_fetch_creds_end_vector (apiCB       *in_context,
-                                          ccache_cit **io_iterator);
-
-cc_int32 __cc_free_principal_vector (apiCB  *in_context,
-                                     char  **io_principal);
-
-cc_int32 __cc_free_name_vector (apiCB  *in_context,
-                                char  **io_name);
-
-cc_int32 __cc_free_creds_vector (apiCB       *in_context,
-                                 cred_union **io_credentials);
-
-cc_int32 __cc_free_NC_info_vector (apiCB    *in_context,
-                                   infoNC ***io_info);
diff --git a/src/ccapi/server/mac/CCacheServerInfo.plist b/src/ccapi/server/mac/CCacheServerInfo.plist
deleted file mode 100644
index f5397f8..0000000
--- a/src/ccapi/server/mac/CCacheServerInfo.plist
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>CCacheServer</string>
-	<key>CFBundleGetInfoString</key>
-	<string>4.1</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>edu.mit.Kerberos.CCacheServer</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Kerberos Credentials Cache Server</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>CCSa</string>
-	<key>CFBundleVersion</key>
-	<string>0.0.1d1</string>
-        <key>CFBundleShortVersionString</key>
-        <string>5.5</string>
-        <key>CFBundleGetInfoString</key>
-        <string>5.5 Copyright MIT</string>
-        <key>KfMDisplayVersion</key>
-        <string>5.5 Copyright MIT</string>
-        <key>KfMDisplayCopyright</key>
-        <string>Copyright MIT</string>
-        <key>NSHumanReadableCopyright</key>
-        <string>5.5 Copyright MIT</string>
-	<key>LSBackgroundOnly</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/src/ccapi/server/mac/ccs_os_notify.c b/src/ccapi/server/mac/ccs_os_notify.c
deleted file mode 100644
index e758deb..0000000
--- a/src/ccapi/server/mac/ccs_os_notify.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ccapi/server/mac/ccs_os_notify.c */
-/*
- * Copyright 2006-2008 Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#include "ccs_common.h"
-#include "ccs_os_notify.h"
-#include <CoreFoundation/CoreFoundation.h>
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_notify_cache_collection_changed (ccs_cache_collection_t io_cache_collection)
-{
-    cc_int32 err = ccNoError;
-
-    if (!io_cache_collection) { err = cci_check_error (ccErrBadParam); }
-
-    if (!err) {
-        CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter ();
-
-        if (center) {
-            CFNotificationCenterPostNotification (center,
-                                                  kCCAPICacheCollectionChangedNotification,
-                                                  NULL, NULL, TRUE);
-        }
-    }
-
-
-
-    return cci_check_error (err);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_notify_ccache_changed (ccs_cache_collection_t  io_cache_collection,
-                                       const char             *in_ccache_name)
-{
-    cc_int32 err = ccNoError;
-
-    if (!io_cache_collection) { err = cci_check_error (ccErrBadParam); }
-    if (!in_ccache_name     ) { err = cci_check_error (ccErrBadParam); }
-
-    if (!err) {
-        CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter ();
-        CFStringRef name = CFStringCreateWithCString (kCFAllocatorDefault,
-                                                      in_ccache_name,
-                                                      kCFStringEncodingUTF8);
-
-        if (center && name) {
-            CFNotificationCenterPostNotification (center,
-                                                  kCCAPICCacheChangedNotification,
-                                                  name, NULL, TRUE);
-        }
-
-        if (name) { CFRelease (name); }
-    }
-
-    return cci_check_error (err);
-}
diff --git a/src/ccapi/server/mac/ccs_os_pipe.c b/src/ccapi/server/mac/ccs_os_pipe.c
deleted file mode 100644
index 5d9fff2..0000000
--- a/src/ccapi/server/mac/ccs_os_pipe.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ccapi/server/mac/ccs_os_pipe.c */
-/*
- * Copyright 2006 Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#include "ccs_common.h"
-#include "ccs_os_pipe.h"
-#include <mach/port.h>
-
-/* On macOS ccs_pipe_t is a mach_port_t */
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_pipe_valid (ccs_pipe_t in_pipe)
-{
-    return MACH_PORT_VALID (in_pipe);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_pipe_compare (ccs_pipe_t  in_pipe,
-                              ccs_pipe_t  in_compare_to_pipe,
-                              cc_uint32  *out_equal)
-{
-    cc_int32 err = ccNoError;
-
-    if (!in_pipe           ) { err = cci_check_error (ccErrBadParam); }
-    if (!in_compare_to_pipe) { err = cci_check_error (ccErrBadParam); }
-    if (!out_equal         ) { err = cci_check_error (ccErrBadParam); }
-
-    if (!err) {
-        *out_equal = (in_pipe == in_compare_to_pipe);
-    }
-
-    return cci_check_error (err);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_pipe_copy (ccs_pipe_t *out_pipe,
-			   ccs_pipe_t  in_pipe)
-{
-    cc_int32 err = 0;
-
-    *out_pipe = in_pipe;
-
-    return cci_check_error (err);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_pipe_release (ccs_pipe_t io_pipe)
-{
-    cc_int32 err = 0;
-
-    /* Nothing to do here on macOS */
-
-    return cci_check_error (err);
-}
diff --git a/src/ccapi/server/mac/ccs_os_server.c b/src/ccapi/server/mac/ccs_os_server.c
deleted file mode 100644
index b16f5e0..0000000
--- a/src/ccapi/server/mac/ccs_os_server.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ccapi/server/mac/ccs_os_server.c */
-/*
- * Copyright 2006 Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#include "ccs_common.h"
-
-#include <syslog.h>
-#include "k5_mig_server.h"
-#include "ccs_os_server.h"
-
-/* ------------------------------------------------------------------------ */
-
-int32_t k5_ipc_server_add_client (mach_port_t in_client_port)
-{
-    return cci_check_error (ccs_server_add_client (in_client_port));
-}
-
-/* ------------------------------------------------------------------------ */
-
-int32_t k5_ipc_server_remove_client (mach_port_t in_client_port)
-{
-    return cci_check_error (ccs_server_remove_client (in_client_port));
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-kern_return_t k5_ipc_server_handle_request (mach_port_t    in_connection_port,
-                                            mach_port_t    in_reply_port,
-                                            k5_ipc_stream  in_request_stream)
-{
-    return cci_check_error (ccs_server_handle_request (in_connection_port,
-                                                       in_reply_port,
-                                                       in_request_stream));
-}
-
-#pragma mark -
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_server_initialize (int argc, const char *argv[])
-{
-    cc_int32 err = 0;
-
-    openlog (argv[0], LOG_CONS | LOG_PID, LOG_AUTH);
-    syslog (LOG_INFO, "Starting up.");
-
-    return cci_check_error (err);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_server_cleanup (int argc, const char *argv[])
-{
-    cc_int32 err = 0;
-
-    syslog (LOG_NOTICE, "Exiting.");
-
-    return cci_check_error (err);
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[])
-{
-    return cci_check_error (k5_ipc_server_listen_loop ());
-}
-
-/* ------------------------------------------------------------------------ */
-
-cc_int32 ccs_os_server_send_reply (ccs_pipe_t   in_reply_pipe,
-                                   k5_ipc_stream in_reply_stream)
-{
-    return cci_check_error (k5_ipc_server_send_reply (in_reply_pipe,
-                                                      in_reply_stream));
-}
diff --git a/src/ccapi/server/mac/edu.mit.Kerberos.CCacheServer.plist b/src/ccapi/server/mac/edu.mit.Kerberos.CCacheServer.plist
deleted file mode 100644
index c002431..0000000
--- a/src/ccapi/server/mac/edu.mit.Kerberos.CCacheServer.plist
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>Label</key>
-	<string>edu.mit.Kerberos.CCacheServer</string>
-	<key>LimitLoadToSessionType</key>
-	<string>Background</string>
-	<key>Program</key>
-	<string>/System/Library/CoreServices/CCacheServer.app/Contents/MacOS/CCacheServer</string>
-	<key>MachServices</key>
-	<dict>
-		<key>edu.mit.Kerberos.CCacheServer.ipcLookup</key>
-		<dict>
-			<key>HideUntilCheckIn</key>
-			<true/>
-			<key>ResetAtClose</key>
-			<true/>
-		</dict>
-		<key>edu.mit.Kerberos.CCacheServer.ipcService</key>
-		<true/>
-	</dict>
-	<key>EnableTransactions</key>
-	<true/>
-	<key>OnDemand</key>
-	<true/>
-	<key>ThrottleInterval</key>
-	<integer>0</integer>
-	<key>EnvironmentVariables</key>
-	<dict>
-		<key>CFFIXED_USER_HOME</key>
-		<string>/var/empty</string>
-	</dict>
-</dict>
-</plist>