Rename functions from k5_ipc_stream_* to krb5int_ipc_stream_*, because some of them will have to be exported

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

8 files changed, 108 insertions, 108 deletions

diff --git a/src/ccapi/lib/ccapi_ccache.c b/src/ccapi/lib/ccapi_ccache.c
index 57c6f83aa..ec64c44d2 100644
--- a/src/ccapi/lib/ccapi_ccache.c
+++ b/src/ccapi/lib/ccapi_ccache.c
@@ -221,10 +221,10 @@ cc_int32 ccapi_ccache_get_credentials_version (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (reply, out_credentials_version);
+        err = krb5int_ipc_stream_read_uint32 (reply, out_credentials_version);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -250,15 +250,15 @@ cc_int32 ccapi_ccache_get_name (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (reply, &name);
+        err = krb5int_ipc_stream_read_string (reply, &name);
     }
     
     if (!err) {
         err = cci_string_new (out_name, name);
     }
     
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_free_string (name);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_free_string (name);
         
     return cci_check_error (err);
 }
@@ -279,11 +279,11 @@ cc_int32 ccapi_ccache_get_principal (cc_ccache_t  in_ccache,
     if (!out_principal) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
     
     if (!err) {
@@ -294,16 +294,16 @@ cc_int32 ccapi_ccache_get_principal (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (reply, &principal);
+        err = krb5int_ipc_stream_read_string (reply, &principal);
     }
     
     if (!err) {
         err = cci_string_new (out_principal, principal);
     }
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_free_string (principal);
     
     return cci_check_error (err);
 }
@@ -322,15 +322,15 @@ cc_int32 ccapi_ccache_set_principal (cc_ccache_t  io_ccache,
     if (!in_principal) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_principal);
+        err = krb5int_ipc_stream_write_string (request, in_principal);
     }
 
     if (!err) {
@@ -340,7 +340,7 @@ cc_int32 ccapi_ccache_set_principal (cc_ccache_t  io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
 
     return cci_check_error (err);
 }
@@ -358,7 +358,7 @@ cc_int32 ccapi_ccache_store_credentials (cc_ccache_t                 io_ccache,
     if (!in_credentials_union) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
@@ -372,7 +372,7 @@ cc_int32 ccapi_ccache_store_credentials (cc_ccache_t                 io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -390,7 +390,7 @@ cc_int32 ccapi_ccache_remove_credentials (cc_ccache_t      io_ccache,
     if (!in_credentials) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
@@ -404,7 +404,7 @@ cc_int32 ccapi_ccache_remove_credentials (cc_ccache_t      io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -437,7 +437,7 @@ cc_int32 ccapi_ccache_new_credentials_iterator (cc_ccache_t                in_cc
         err = cci_credentials_iterator_new (out_credentials_iterator, identifier);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     cci_identifier_release (identifier);
 
     return cci_check_error (err);
@@ -459,7 +459,7 @@ cc_int32 ccapi_ccache_move (cc_ccache_t io_source_ccache,
     if (!io_destination_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
@@ -473,7 +473,7 @@ cc_int32 ccapi_ccache_move (cc_ccache_t io_source_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
 
     return cci_check_error (err);
 }
@@ -491,15 +491,15 @@ cc_int32 ccapi_ccache_lock (cc_ccache_t io_ccache,
     if (!io_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_lock_type);
+        err = krb5int_ipc_stream_write_uint32 (request, in_lock_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_block);
+        err = krb5int_ipc_stream_write_uint32 (request, in_block);
     }
     
     if (!err) {
@@ -509,7 +509,7 @@ cc_int32 ccapi_ccache_lock (cc_ccache_t io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -553,10 +553,10 @@ cc_int32 ccapi_ccache_get_last_default_time (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, out_last_default_time);
+        err = krb5int_ipc_stream_read_time (reply, out_last_default_time);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
 
     return cci_check_error (err);
 }
@@ -581,10 +581,10 @@ cc_int32 ccapi_ccache_get_change_time (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, out_change_time);
+        err = krb5int_ipc_stream_read_time (reply, out_change_time);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -601,11 +601,11 @@ cc_int32 ccapi_ccache_wait_for_change (cc_ccache_t  in_ccache)
     if (!in_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (request, ccache->last_wait_for_change_time);
+        err = krb5int_ipc_stream_write_time (request, ccache->last_wait_for_change_time);
     }
     
     if (!err) {
@@ -616,11 +616,11 @@ cc_int32 ccapi_ccache_wait_for_change (cc_ccache_t  in_ccache)
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, &ccache->last_wait_for_change_time);
+        err = krb5int_ipc_stream_read_time (reply, &ccache->last_wait_for_change_time);
     }    
         
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -663,11 +663,11 @@ cc_int32 ccapi_ccache_get_kdc_time_offset (cc_ccache_t  in_ccache,
     if (!out_time_offset) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
 
     if (!err) {
@@ -678,11 +678,11 @@ cc_int32 ccapi_ccache_get_kdc_time_offset (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, out_time_offset);
+        err = krb5int_ipc_stream_read_time (reply, out_time_offset);
     }
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -700,15 +700,15 @@ cc_int32 ccapi_ccache_set_kdc_time_offset (cc_ccache_t io_ccache,
     if (!io_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (request, in_time_offset);
+        err = krb5int_ipc_stream_write_time (request, in_time_offset);
     }
     
     if (!err) {
@@ -718,7 +718,7 @@ cc_int32 ccapi_ccache_set_kdc_time_offset (cc_ccache_t io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -735,11 +735,11 @@ cc_int32 ccapi_ccache_clear_kdc_time_offset (cc_ccache_t io_ccache,
     if (!io_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
     
     if (!err) {
@@ -749,7 +749,7 @@ cc_int32 ccapi_ccache_clear_kdc_time_offset (cc_ccache_t io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/lib/ccapi_ccache_iterator.c b/src/ccapi/lib/ccapi_ccache_iterator.c
index 0f5d241f9..0df9e0f8e 100644
--- a/src/ccapi/lib/ccapi_ccache_iterator.c
+++ b/src/ccapi/lib/ccapi_ccache_iterator.c
@@ -193,7 +193,7 @@ cc_int32 ccapi_ccache_iterator_next (cc_ccache_iterator_t  in_ccache_iterator,
         err = cci_ccache_new (out_ccache, identifier);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     cci_identifier_release (identifier);
     
     return cci_check_error (err);
@@ -240,7 +240,7 @@ cc_int32 ccapi_ccache_iterator_clone (cc_ccache_iterator_t  in_ccache_iterator,
     }
 
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/lib/ccapi_context.c b/src/ccapi/lib/ccapi_context.c
index 7ba3db4d2..9b1d05dc8 100644
--- a/src/ccapi/lib/ccapi_context.c
+++ b/src/ccapi/lib/ccapi_context.c
@@ -247,11 +247,11 @@ cc_int32 ccapi_context_get_change_time (cc_context_t  in_context,
                                        NULL, &reply);
     }
     
-    if (!err && k5_ipc_stream_size (reply) > 0) {
+    if (!err && krb5int_ipc_stream_size (reply) > 0) {
         cc_time_t change_time = 0;
         
         /* got a response from the server */
-        err = k5_ipc_stream_read_time (reply, &change_time);
+        err = krb5int_ipc_stream_read_time (reply, &change_time);
         
         if (!err) {
             err = cci_context_change_time_update (context->identifier,
@@ -263,7 +263,7 @@ cc_int32 ccapi_context_get_change_time (cc_context_t  in_context,
         err = cci_context_change_time_get (out_change_time);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -280,11 +280,11 @@ cc_int32 ccapi_context_wait_for_change (cc_context_t  in_context)
     if (!in_context) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (request, context->last_wait_for_change_time);
+        err = krb5int_ipc_stream_write_time (request, context->last_wait_for_change_time);
     }
 
     if (!err) {
@@ -299,11 +299,11 @@ cc_int32 ccapi_context_wait_for_change (cc_context_t  in_context)
     }
 
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, &context->last_wait_for_change_time);
+        err = krb5int_ipc_stream_read_time (reply, &context->last_wait_for_change_time);
     }
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
 
     return cci_check_error (err);
 }
@@ -334,9 +334,9 @@ cc_int32 ccapi_context_get_default_ccache_name (cc_context_t  in_context,
     }
     
     if (!err) {
-        if (k5_ipc_stream_size (reply) > 0) {
+        if (krb5int_ipc_stream_size (reply) > 0) {
             /* got a response from the server */
-            err = k5_ipc_stream_read_string (reply, &reply_name);
+            err = krb5int_ipc_stream_read_string (reply, &reply_name);
             
             if (!err) {
                 name = reply_name;
@@ -350,8 +350,8 @@ cc_int32 ccapi_context_get_default_ccache_name (cc_context_t  in_context,
         err = cci_string_new (out_name, name);
     }
     
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_free_string (reply_name);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_free_string (reply_name);
     
     return cci_check_error (err);
 }
@@ -373,11 +373,11 @@ cc_int32 ccapi_context_open_ccache (cc_context_t  in_context,
     if (!out_ccache  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_name);
+        err = krb5int_ipc_stream_write_string (request, in_name);
     }
     
     if (!err) {
@@ -391,7 +391,7 @@ cc_int32 ccapi_context_open_ccache (cc_context_t  in_context,
                                        &reply);
     }
     
-    if (!err && !(k5_ipc_stream_size (reply) > 0)) {
+    if (!err && !(krb5int_ipc_stream_size (reply) > 0)) {
         err = ccErrCCacheNotFound;
     }
     
@@ -404,8 +404,8 @@ cc_int32 ccapi_context_open_ccache (cc_context_t  in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -434,7 +434,7 @@ cc_int32 ccapi_context_open_default_ccache (cc_context_t  in_context,
                                        &reply);
     }
     
-    if (!err && !(k5_ipc_stream_size (reply) > 0)) {
+    if (!err && !(krb5int_ipc_stream_size (reply) > 0)) {
         err = ccErrCCacheNotFound;
     }
     
@@ -447,7 +447,7 @@ cc_int32 ccapi_context_open_default_ccache (cc_context_t  in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -472,19 +472,19 @@ cc_int32 ccapi_context_create_ccache (cc_context_t  in_context,
     if (!out_ccache  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_name);
+        err = krb5int_ipc_stream_write_string (request, in_name);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_cred_vers);
+        err = krb5int_ipc_stream_write_uint32 (request, in_cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_principal);
+        err = krb5int_ipc_stream_write_string (request, in_principal);
     }
     
     if (!err) {
@@ -507,8 +507,8 @@ cc_int32 ccapi_context_create_ccache (cc_context_t  in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -531,15 +531,15 @@ cc_int32 ccapi_context_create_default_ccache (cc_context_t  in_context,
     if (!out_ccache  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_cred_vers);
+        err = krb5int_ipc_stream_write_uint32 (request, in_cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_principal);
+        err = krb5int_ipc_stream_write_string (request, in_principal);
     }
     
     if (!err) {
@@ -562,8 +562,8 @@ cc_int32 ccapi_context_create_default_ccache (cc_context_t  in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -586,15 +586,15 @@ cc_int32 ccapi_context_create_new_ccache (cc_context_t in_context,
     if (!out_ccache  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_cred_vers);
+        err = krb5int_ipc_stream_write_uint32 (request, in_cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_principal);
+        err = krb5int_ipc_stream_write_string (request, in_principal);
     }
     
     if (!err) {
@@ -617,8 +617,8 @@ cc_int32 ccapi_context_create_new_ccache (cc_context_t in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -648,7 +648,7 @@ cc_int32 ccapi_context_new_ccache_iterator (cc_context_t          in_context,
     }
     
     if (!err) {
-        if (k5_ipc_stream_size (reply) > 0) {
+        if (krb5int_ipc_stream_size (reply) > 0) {
             err = cci_identifier_read (&identifier, reply);
         } else {
             identifier = cci_identifier_uninitialized;
@@ -659,7 +659,7 @@ cc_int32 ccapi_context_new_ccache_iterator (cc_context_t          in_context,
         err = cci_ccache_iterator_new (out_iterator, identifier);
     }
 
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     cci_identifier_release (identifier);
 
     return cci_check_error (err);
@@ -678,15 +678,15 @@ cc_int32 ccapi_context_lock (cc_context_t in_context,
     if (!in_context) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_lock_type);
+        err = krb5int_ipc_stream_write_uint32 (request, in_lock_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_block);
+        err = krb5int_ipc_stream_write_uint32 (request, in_block);
     }
     
     if (!err) {
@@ -700,7 +700,7 @@ cc_int32 ccapi_context_lock (cc_context_t in_context,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -795,7 +795,7 @@ static cc_int32 cci_context_sync (cci_context_t in_context,
     }
     
     if (!err) {
-        if (k5_ipc_stream_size (reply) > 0) {
+        if (krb5int_ipc_stream_size (reply) > 0) {
             err = cci_identifier_read (&new_identifier, reply);
         } else {
             new_identifier = cci_identifier_uninitialized;
@@ -827,7 +827,7 @@ static cc_int32 cci_context_sync (cci_context_t in_context,
     }
         
     cci_identifier_release (new_identifier);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/lib/ccapi_credentials_iterator.c b/src/ccapi/lib/ccapi_credentials_iterator.c
index 4571b64f8..59ffc7c64 100644
--- a/src/ccapi/lib/ccapi_credentials_iterator.c
+++ b/src/ccapi/lib/ccapi_credentials_iterator.c
@@ -168,7 +168,7 @@ cc_int32 ccapi_credentials_iterator_next (cc_credentials_iterator_t  in_credenti
         err = cci_credentials_read (out_credentials, reply);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -201,7 +201,7 @@ cc_int32 ccapi_credentials_iterator_clone (cc_credentials_iterator_t  in_credent
         err = cci_credentials_iterator_new (out_credentials_iterator, identifier);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     cci_identifier_release (identifier);
     
     return cci_check_error (err);
diff --git a/src/ccapi/lib/ccapi_ipc.c b/src/ccapi/lib/ccapi_ipc.c
index 43993dc76..8d8b2d209 100644
--- a/src/ccapi/lib/ccapi_ipc.c
+++ b/src/ccapi/lib/ccapi_ipc.c
@@ -65,15 +65,15 @@ static cc_int32 _cci_ipc_send (enum cci_msg_id_t  in_request_name,
     }
     
     if (!err && in_request_data) {
-        err = k5_ipc_stream_write (request, 
-                                k5_ipc_stream_data (in_request_data), 
-                                k5_ipc_stream_size (in_request_data));
+        err = krb5int_ipc_stream_write (request, 
+                                krb5int_ipc_stream_data (in_request_data), 
+                                krb5int_ipc_stream_size (in_request_data));
     }
     
     if (!err) {
         err = cci_os_ipc (in_launch_server, request, &reply);
 
-        if (!err && k5_ipc_stream_size (reply) > 0) {
+        if (!err && krb5int_ipc_stream_size (reply) > 0) {
             err = cci_message_read_reply_header (reply, &reply_error);
         }
     }
@@ -87,8 +87,8 @@ static cc_int32 _cci_ipc_send (enum cci_msg_id_t  in_request_name,
         reply = NULL; /* take ownership */
     }
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/lib/win/ccapi_os_ipc.cxx b/src/ccapi/lib/win/ccapi_os_ipc.cxx
index 6ccd59b9a..b6fc70155 100644
--- a/src/ccapi/lib/win/ccapi_os_ipc.cxx
+++ b/src/ccapi/lib/win/ccapi_os_ipc.cxx
@@ -207,8 +207,8 @@ extern "C" cc_int32 cci_os_ipc_msg( cc_int32        in_launch_server,
                 in_msg,                         /* Message type */
                 (unsigned char*)&ptspdata,      /* Our tspdata* will be sent back to the reply proc. */
                 (unsigned char*)uuid,
-                k5_ipc_stream_size(in_request_stream),
-                (unsigned char*)k5_ipc_stream_data(in_request_stream), /* Data buffer */
+                krb5int_ipc_stream_size(in_request_stream),
+                (unsigned char*)krb5int_ipc_stream_data(in_request_stream), /* Data buffer */
                 sst,                            /* session start time */
                 (long*)(&err) );                /* Return code */
             }
@@ -376,4 +376,4 @@ cc_int32 ccapi_connect(const struct tspdata* tsp) {
         } 
     
     return status;
-    }
\ No newline at end of file
+    }
diff --git a/src/ccapi/lib/win/ccs_reply_proc.c b/src/ccapi/lib/win/ccs_reply_proc.c
index 8eb340836..b3ef3f740 100644
--- a/src/ccapi/lib/win/ccs_reply_proc.c
+++ b/src/ccapi/lib/win/ccs_reply_proc.c
@@ -53,11 +53,11 @@ void ccs_rpc_request_reply(
     cci_debug_printf("%s! msg#:%d SST:%ld uuid:%s", __FUNCTION__, rpcmsg, srvStartTime, uuid);
 #endif
     if (!status) {                         
-        status = k5_ipc_stream_new (&stream);  /* Create a stream for the request data */
+        status = krb5int_ipc_stream_new (&stream);  /* Create a stream for the request data */
         }
 
     if (!status) {                          /* Put the data into the stream */
-        status = k5_ipc_stream_write (stream, chIn, cbIn);
+        status = krb5int_ipc_stream_write (stream, chIn, cbIn);
         }
 
     if (!status) {                          /* Put the data into the stream */
diff --git a/src/ccapi/lib/win/debug.exports b/src/ccapi/lib/win/debug.exports
index d7fbcc152..7bf84d272 100644
--- a/src/ccapi/lib/win/debug.exports
+++ b/src/ccapi/lib/win/debug.exports
@@ -3,9 +3,9 @@
     cci_os_ipc

     cci_os_ipc_msg

     cci_os_ipc_thread_init

-    k5_ipc_stream_data

-    k5_ipc_stream_write

-    k5_ipc_stream_new

+    krb5int_ipc_stream_data

+    krb5int_ipc_stream_write

+    krb5int_ipc_stream_new

     

     ccs_authenticate