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, 75 insertions, 75 deletions

diff --git a/src/ccapi/server/ccs_cache_collection.c b/src/ccapi/server/ccs_cache_collection.c
index 3790a10aac..2137e816a6 100644
--- a/src/ccapi/server/ccs_cache_collection.c
+++ b/src/ccapi/server/ccs_cache_collection.c
@@ -152,11 +152,11 @@ cc_int32 ccs_cache_collection_changed (ccs_cache_collection_t io_cache_collectio
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
 
     if (!err) {
-	err = k5_ipc_stream_write_time (reply_data, io_cache_collection->last_changed_time);
+	err = krb5int_ipc_stream_write_time (reply_data, io_cache_collection->last_changed_time);
     }
     
     if (!err) {
@@ -181,7 +181,7 @@ cc_int32 ccs_cache_collection_changed (ccs_cache_collection_t io_cache_collectio
         err = ccs_os_notify_cache_collection_changed (io_cache_collection);
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
@@ -601,7 +601,7 @@ static cc_int32 ccs_cache_collection_get_change_time (ccs_cache_collection_t io_
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time);
+        err = krb5int_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time);
     }
     
     return cci_check_error (err);    
@@ -627,12 +627,12 @@ static cc_int32 ccs_cache_collection_wait_for_change (ccs_pipe_t              in
     if (!out_will_block                 ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (in_request_data, &last_wait_for_change_time);
+        err = krb5int_ipc_stream_read_time (in_request_data, &last_wait_for_change_time);
     }
     
     if (!err) {
 	if (last_wait_for_change_time < io_cache_collection->last_changed_time) {
-	    err = k5_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time);
+	    err = krb5int_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time);
 	
 	} else {
 	    ccs_callback_t callback = NULL;
@@ -690,7 +690,7 @@ static cc_int32 ccs_cache_collection_get_default_ccache_name (ccs_cache_collecti
                 err = ccs_ccache_write_name (ccache, io_reply_data);
             }
         } else {
-            err = k5_ipc_stream_write_string (io_reply_data, 
+            err = krb5int_ipc_stream_write_string (io_reply_data, 
                                            k_cci_context_initial_ccache_name);
         }
     }
@@ -713,7 +713,7 @@ static cc_int32 ccs_cache_collection_open_ccache (ccs_cache_collection_t io_cach
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &name);
+        err = krb5int_ipc_stream_read_string (in_request_data, &name);
     }
     
     if (!err) {
@@ -725,7 +725,7 @@ static cc_int32 ccs_cache_collection_open_ccache (ccs_cache_collection_t io_cach
         err = ccs_ccache_write (ccache, io_reply_data);
     }
     
-    k5_ipc_stream_free_string (name);
+    krb5int_ipc_stream_free_string (name);
         
     return cci_check_error (err);    
 }
@@ -772,15 +772,15 @@ static cc_int32 ccs_cache_collection_create_ccache (ccs_cache_collection_t io_ca
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &name);
+        err = krb5int_ipc_stream_read_string (in_request_data, &name);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &principal);
+        err = krb5int_ipc_stream_read_string (in_request_data, &principal);
     }
     
     if (!err) {
@@ -805,8 +805,8 @@ static cc_int32 ccs_cache_collection_create_ccache (ccs_cache_collection_t io_ca
         err = ccs_cache_collection_changed (io_cache_collection);
     }
     
-    k5_ipc_stream_free_string (name);
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_free_string (name);
+    krb5int_ipc_stream_free_string (principal);
     
     return cci_check_error (err);    
 }
@@ -827,11 +827,11 @@ static cc_int32 ccs_cache_collection_create_default_ccache (ccs_cache_collection
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &principal);
+        err = krb5int_ipc_stream_read_string (in_request_data, &principal);
     }
     
     if (!err) {
@@ -864,7 +864,7 @@ static cc_int32 ccs_cache_collection_create_default_ccache (ccs_cache_collection
         err = ccs_cache_collection_changed (io_cache_collection);
     }
     
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_free_string (principal);
     
     return cci_check_error (err);    
 }
@@ -886,11 +886,11 @@ static cc_int32 ccs_cache_collection_create_new_ccache (ccs_cache_collection_t i
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &principal);
+        err = krb5int_ipc_stream_read_string (in_request_data, &principal);
     }
     
     if (!err) {
@@ -912,7 +912,7 @@ static cc_int32 ccs_cache_collection_create_new_ccache (ccs_cache_collection_t i
     }
     
     free (name);
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_free_string (principal);
     
     return cci_check_error (err);    
 }
@@ -964,11 +964,11 @@ static cc_int32 ccs_cache_collection_lock (ccs_pipe_t              in_client_pip
     if (!io_reply_data                  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &lock_type);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &lock_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &block);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &block);
     }
     
     if (!err) {
@@ -1028,7 +1028,7 @@ static cc_int32 ccs_cache_collection_unlock (ccs_pipe_t             in_client_pi
     if (!out_reply_data                 ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
@@ -1104,7 +1104,7 @@ static cc_int32 ccs_cache_collection_unlock (ccs_pipe_t             in_client_pi
         }
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/server/ccs_ccache.c b/src/ccapi/server/ccs_ccache.c
index 88cf1e0d96..d7662343a3 100644
--- a/src/ccapi/server/ccs_ccache.c
+++ b/src/ccapi/server/ccs_ccache.c
@@ -335,11 +335,11 @@ cc_int32 ccs_ccache_changed (ccs_ccache_t           io_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
-	err = k5_ipc_stream_write_time (reply_data, io_ccache->last_changed_time);
+	err = krb5int_ipc_stream_write_time (reply_data, io_ccache->last_changed_time);
     }
 
     if (!err) {
@@ -365,7 +365,7 @@ cc_int32 ccs_ccache_changed (ccs_ccache_t           io_ccache,
                                             io_ccache->name);
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
@@ -487,7 +487,7 @@ cc_int32 ccs_ccache_write_name (ccs_ccache_t in_ccache,
     if (!io_stream) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, in_ccache->name);
+        err = krb5int_ipc_stream_write_string (io_stream, in_ccache->name);
     }
     
     return cci_check_error (err);    
@@ -562,7 +562,7 @@ static cc_int32 ccs_ccache_get_credentials_version (ccs_ccache_t           io_cc
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_reply_data, io_ccache->creds_version);
+        err = krb5int_ipc_stream_write_uint32 (io_reply_data, io_ccache->creds_version);
     }
     
     return cci_check_error (err);    
@@ -583,7 +583,7 @@ static cc_int32 ccs_ccache_get_name (ccs_ccache_t           io_ccache,
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_reply_data, io_ccache->name);
+        err = krb5int_ipc_stream_write_string (io_reply_data, io_ccache->name);
     }
     
     return cci_check_error (err);    
@@ -605,7 +605,7 @@ static cc_int32 ccs_ccache_get_principal (ccs_ccache_t           io_ccache,
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &version);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &version);
     }
     
     if (!err && version == cc_credentials_v4_v5) {
@@ -614,10 +614,10 @@ static cc_int32 ccs_ccache_get_principal (ccs_ccache_t           io_ccache,
     
     if (!err) {
         if (version == cc_credentials_v4) {
-            err = k5_ipc_stream_write_string (io_reply_data, io_ccache->v4_principal);
+            err = krb5int_ipc_stream_write_string (io_reply_data, io_ccache->v4_principal);
             
         } else if (version == cc_credentials_v5) {
-            err = k5_ipc_stream_write_string (io_reply_data, io_ccache->v5_principal);
+            err = krb5int_ipc_stream_write_string (io_reply_data, io_ccache->v5_principal);
             
         } else {
             err = cci_check_error (ccErrBadCredentialsVersion);
@@ -644,11 +644,11 @@ static cc_int32 ccs_ccache_set_principal (ccs_ccache_t           io_ccache,
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &version);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &principal);
+        err = krb5int_ipc_stream_read_string (in_request_data, &principal);
     }
     
     if (!err) {
@@ -681,7 +681,7 @@ static cc_int32 ccs_ccache_set_principal (ccs_ccache_t           io_ccache,
         err = ccs_ccache_changed (io_ccache, io_cache_collection);
     }
     
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_free_string (principal);
         
     return cci_check_error (err);    
 }
@@ -834,11 +834,11 @@ static cc_int32 ccs_ccache_lock (ccs_pipe_t             in_client_pipe,
     if (!io_reply_data                  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &lock_type);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &lock_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &block);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &block);
     }
     
     if (!err) {
@@ -892,7 +892,7 @@ static cc_int32 ccs_ccache_get_last_default_time (ccs_ccache_t           io_ccac
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_reply_data, io_ccache->last_default_time);
+        err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->last_default_time);
     }
     
     return cci_check_error (err);    
@@ -913,7 +913,7 @@ static cc_int32 ccs_ccache_get_change_time (ccs_ccache_t           io_ccache,
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time);
+        err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time);
     }
     
     return cci_check_error (err);    
@@ -941,13 +941,13 @@ static cc_int32 ccs_ccache_wait_for_change (ccs_pipe_t              in_client_pi
     if (!out_will_block                 ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (in_request_data, &last_wait_for_change_time);
+        err = krb5int_ipc_stream_read_time (in_request_data, &last_wait_for_change_time);
     }
     
     if (!err) {
 	if (last_wait_for_change_time < io_ccache->last_changed_time) {
 	    cci_debug_printf ("%s returning immediately", __FUNCTION__);
-	    err = k5_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time);
+	    err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time);
 	    
 	} else {
 	    ccs_callback_t callback = NULL;
@@ -995,20 +995,20 @@ static cc_int32 ccs_ccache_get_kdc_time_offset (ccs_ccache_t           io_ccache
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
         if (cred_vers == cc_credentials_v4) {
             if (io_ccache->kdc_time_offset_v4_valid) {
-                err = k5_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v4);
+                err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v4);
             } else {
                 err = cci_check_error (ccErrTimeOffsetNotSet);
             }
             
         } else if (cred_vers == cc_credentials_v5) {
             if (io_ccache->kdc_time_offset_v5_valid) {
-                err = k5_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v5);
+                err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v5);
             } else {
                 err = cci_check_error (ccErrTimeOffsetNotSet);
             }
@@ -1037,18 +1037,18 @@ static cc_int32 ccs_ccache_set_kdc_time_offset (ccs_ccache_t           io_ccache
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
         if (cred_vers == cc_credentials_v4) {
-            err = k5_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v4);
+            err = krb5int_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v4);
             
             if (!err) {
                 io_ccache->kdc_time_offset_v4_valid = 1;
             }
         } else if (cred_vers == cc_credentials_v5) {
-            err = k5_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v5);
+            err = krb5int_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v5);
             
             if (!err) {
                 io_ccache->kdc_time_offset_v5_valid = 1;
@@ -1081,7 +1081,7 @@ static cc_int32 ccs_ccache_clear_kdc_time_offset (ccs_ccache_t           io_ccac
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
@@ -1132,7 +1132,7 @@ cc_int32 ccs_ccache_handle_message (ccs_pipe_t              in_client_pipe,
     if (!out_reply_data                 ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
@@ -1231,7 +1231,7 @@ cc_int32 ccs_ccache_handle_message (ccs_pipe_t              in_client_pipe,
         }
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/server/ccs_ccache_iterator.c b/src/ccapi/server/ccs_ccache_iterator.c
index 0e05056440..fb007bf6ba 100644
--- a/src/ccapi/server/ccs_ccache_iterator.c
+++ b/src/ccapi/server/ccs_ccache_iterator.c
@@ -119,7 +119,7 @@ static  cc_int32 ccs_ccache_iterator_clone (ccs_ccache_iterator_t  io_ccache_ite
     if (!out_reply_data ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
@@ -151,7 +151,7 @@ static  cc_int32 ccs_ccache_iterator_clone (ccs_ccache_iterator_t  io_ccache_ite
         reply_data = NULL; /* take ownership */
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/server/ccs_credentials_iterator.c b/src/ccapi/server/ccs_credentials_iterator.c
index 38e323c267..3ca7eeeea1 100644
--- a/src/ccapi/server/ccs_credentials_iterator.c
+++ b/src/ccapi/server/ccs_credentials_iterator.c
@@ -121,7 +121,7 @@ static  cc_int32 ccs_credentials_iterator_clone (ccs_credentials_iterator_t io_c
     if (!out_reply_data ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
@@ -153,7 +153,7 @@ static  cc_int32 ccs_credentials_iterator_clone (ccs_credentials_iterator_t io_c
         reply_data = NULL; /* take ownership */
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/server/ccs_server.c b/src/ccapi/server/ccs_server.c
index c1bbe539ad..30476e407e 100644
--- a/src/ccapi/server/ccs_server.c
+++ b/src/ccapi/server/ccs_server.c
@@ -366,7 +366,7 @@ cc_int32 ccs_server_handle_request (ccs_pipe_t     in_client_pipe,
     }
 
     cci_identifier_release (request_identifier);
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);    
 }
@@ -386,17 +386,17 @@ cc_int32 ccs_server_send_reply (ccs_pipe_t     in_reply_pipe,
         err = cci_message_new_reply_header (&reply, in_reply_err);
     }
     
-    if (!err && in_reply_data && k5_ipc_stream_size (in_reply_data) > 0) {
-        err = k5_ipc_stream_write (reply, 
-                                k5_ipc_stream_data (in_reply_data), 
-                                k5_ipc_stream_size (in_reply_data));
+    if (!err && in_reply_data && krb5int_ipc_stream_size (in_reply_data) > 0) {
+        err = krb5int_ipc_stream_write (reply, 
+                                krb5int_ipc_stream_data (in_reply_data), 
+                                krb5int_ipc_stream_size (in_reply_data));
     }
     
     if (!err) {
         err = ccs_os_server_send_reply (in_reply_pipe, reply);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);    
 }
diff --git a/src/ccapi/server/win/WorkItem.cpp b/src/ccapi/server/win/WorkItem.cpp
index 2e9ebcc931..1b1725a8aa 100644
--- a/src/ccapi/server/win/WorkItem.cpp
+++ b/src/ccapi/server/win/WorkItem.cpp
@@ -53,17 +53,17 @@ WorkItem::WorkItem(k5_ipc_stream buf, WIN_PIPE* pipe, const long type, const lon
 WorkItem::WorkItem(const WorkItem& item) : _buf(NULL), _rpcmsg(0), _pipe(NULL), _sst(0) {

 

     k5_ipc_stream    _buf = NULL;

-    k5_ipc_stream_new(&_buf);

-    k5_ipc_stream_write(_buf, 

-                     k5_ipc_stream_data(item.payload()),

-                     k5_ipc_stream_size(item.payload()) );

+    krb5int_ipc_stream_new(&_buf);

+    krb5int_ipc_stream_write(_buf, 

+                     krb5int_ipc_stream_data(item.payload()),

+                     krb5int_ipc_stream_size(item.payload()) );

     WorkItem(_buf, item._pipe, item._rpcmsg, item._sst);

     }

 

 WorkItem::WorkItem() : _buf(NULL), _rpcmsg(CCMSG_INVALID), _pipe(NULL), _sst(0) { }

 

 WorkItem::~WorkItem() {

-    if (_buf)   k5_ipc_stream_release(_buf);

+    if (_buf)   krb5int_ipc_stream_release(_buf);

     if (_pipe)  ccs_win_pipe_release(_pipe);

     }

 

@@ -123,4 +123,4 @@ int WorkList::remove(WorkItem** item) {
         }

 

     return !bEmpty;

-    }
\ No newline at end of file
+    }

diff --git a/src/ccapi/server/win/ccs_os_server.cpp b/src/ccapi/server/win/ccs_os_server.cpp
index 99854d1139..e80a1c3aaa 100644
--- a/src/ccapi/server/win/ccs_os_server.cpp
+++ b/src/ccapi/server/win/ccs_os_server.cpp
@@ -279,8 +279,8 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) {
                             break;

                         case CCMSG_PING:

                             cci_debug_printf("  Processing PING");

-                            err = k5_ipc_stream_new  (&stream);

-                            err = k5_ipc_stream_write(stream, "This is a test of the emergency broadcasting system", 52);

+                            err = krb5int_ipc_stream_new  (&stream);

+                            err = krb5int_ipc_stream_write(stream, "This is a test of the emergency broadcasting system", 52);

                             err = ccs_os_server_send_reply(pipe, stream);

                             break;

                         default:

@@ -288,7 +288,7 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) {
                                 rpcmsg, uuid);

                             break;

                         }

-                    if (buf)        k5_ipc_stream_release(buf);

+                    if (buf)        krb5int_ipc_stream_release(buf);

                     /* Don't free uuid, which was allocated here.  A pointer to it is in the 

                        rpcargs struct which was passed to connectionListener which will be

                        received by ccapi_listen when the client exits.  ccapi_listen needs 

@@ -333,8 +333,8 @@ cc_int32 ccs_os_server_send_reply (ccs_pipe_t   in_pipe,
                 (unsigned char*)&h,                 /* client's tspdata* */

                 (unsigned char*)uuid,

                 getMySST(),

-                k5_ipc_stream_size(in_reply_stream),   /* Length of buffer */

-                (const unsigned char*)k5_ipc_stream_data(in_reply_stream),   /* Data buffer */

+                krb5int_ipc_stream_size(in_reply_stream),   /* Length of buffer */

+                (const unsigned char*)krb5int_ipc_stream_data(in_reply_stream),   /* Data buffer */

                 &status );                          /* Return code */

             }

         RpcExcept(1) {

diff --git a/src/ccapi/server/win/ccs_request_proc.c b/src/ccapi/server/win/ccs_request_proc.c
index 8a0da03f4b..8421b72243 100644
--- a/src/ccapi/server/win/ccs_request_proc.c
+++ b/src/ccapi/server/win/ccs_request_proc.c
@@ -52,11 +52,11 @@ void ccs_rpc_request(
     status = (rpcmsg != CCMSG_REQUEST) && (rpcmsg != CCMSG_PING);
     
     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, pbRequest, lenRequest);
+        status = krb5int_ipc_stream_write (stream, pbRequest, lenRequest);
         }
 
     pipe = ccs_win_pipe_new(pszUUID, *p);    
@@ -112,4 +112,4 @@ CC_UINT32 ccs_authenticate(const CC_CHAR* name) {
 
     if (hMap) CloseHandle(hMap);
     return result;
-    }
\ No newline at end of file
+    }