1 files changed, 54 insertions, 54 deletions

diff --git a/src/ccapi/common/cci_cred_union.c b/src/ccapi/common/cci_cred_union.c
index 9740ffd473..94aebddf2a 100644
--- a/src/ccapi/common/cci_cred_union.c
+++ b/src/ccapi/common/cci_cred_union.c
@@ -63,59 +63,59 @@ static cc_uint32 cci_credentials_v4_read (cc_credentials_v4_t **out_v4creds,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &v4creds->version);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &v4creds->version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->principal, cc_v4_name_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->principal, cc_v4_name_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->principal_instance, cc_v4_instance_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->principal_instance, cc_v4_instance_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->service, cc_v4_name_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->service, cc_v4_name_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->service_instance, cc_v4_instance_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->service_instance, cc_v4_instance_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->realm, cc_v4_realm_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->realm, cc_v4_realm_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->session_key, cc_v4_key_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->session_key, cc_v4_key_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &v4creds->kvno);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->kvno);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &v4creds->string_to_key_type);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->string_to_key_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v4creds->issue_date);
+        err = krb5int_ipc_stream_read_time (io_stream, &v4creds->issue_date);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &v4creds->lifetime);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->lifetime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &v4creds->address);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &v4creds->address);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &v4creds->ticket_size);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->ticket_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->ticket, cc_v4_ticket_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->ticket, cc_v4_ticket_size);
     }
     
     if (!err) {
@@ -139,59 +139,59 @@ static cc_uint32 cci_credentials_v4_write (cc_credentials_v4_t *in_v4creds,
     if (!in_v4creds) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_v4creds->version);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_v4creds->version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->principal, cc_v4_name_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->principal, cc_v4_name_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->principal_instance, cc_v4_instance_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->principal_instance, cc_v4_instance_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->service, cc_v4_name_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->service, cc_v4_name_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->service_instance, cc_v4_instance_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->service_instance, cc_v4_instance_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->realm, cc_v4_realm_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->realm, cc_v4_realm_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->session_key, cc_v4_key_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->session_key, cc_v4_key_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->kvno);
+        err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->kvno);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->string_to_key_type);
+        err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->string_to_key_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v4creds->issue_date);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v4creds->issue_date);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->lifetime);
+        err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->lifetime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_v4creds->address);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_v4creds->address);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->ticket_size);
+        err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->ticket_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->ticket, cc_v4_ticket_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->ticket, cc_v4_ticket_size);
     }
     
     return cci_check_error (err);
@@ -249,11 +249,11 @@ static cc_uint32 cci_cc_data_read (cc_data      *io_ccdata,
     if (!io_ccdata) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &type);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &length);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &length);
     }
     
     if (!err && length > 0) {
@@ -261,7 +261,7 @@ static cc_uint32 cci_cc_data_read (cc_data      *io_ccdata,
         if (!data) { err = cci_check_error (ccErrNoMem); }
 
         if (!err) {
-            err = k5_ipc_stream_read (io_stream, data, length);
+            err = krb5int_ipc_stream_read (io_stream, data, length);
         }
     }
     
@@ -288,15 +288,15 @@ static cc_uint32 cci_cc_data_write (cc_data      *in_ccdata,
     if (!in_ccdata) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_ccdata->type);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_ccdata->type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_ccdata->length);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_ccdata->length);
     }
     
     if (!err && in_ccdata->length > 0) {
-        err = k5_ipc_stream_write (io_stream, in_ccdata->data, in_ccdata->length);
+        err = krb5int_ipc_stream_write (io_stream, in_ccdata->data, in_ccdata->length);
     }
     
     return cci_check_error (err);
@@ -340,7 +340,7 @@ static cc_uint32 cci_cc_data_array_read (cc_data      ***io_ccdata_array,
     if (!io_ccdata_array) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &count);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &count);
     }
     
     if (!err && count > 0) {
@@ -387,7 +387,7 @@ static cc_uint32 cci_cc_data_array_write (cc_data      **in_ccdata_array,
     if (!err) {
         for (count = 0; in_ccdata_array && in_ccdata_array[count]; count++);
         
-        err = k5_ipc_stream_write_uint32 (io_stream, count);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, count);
     }
     
     if (!err) {
@@ -461,11 +461,11 @@ static cc_uint32 cci_credentials_v5_read (cc_credentials_v5_t **out_v5creds,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (io_stream, &v5creds->client);
+        err = krb5int_ipc_stream_read_string (io_stream, &v5creds->client);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (io_stream, &v5creds->server);
+        err = krb5int_ipc_stream_read_string (io_stream, &v5creds->server);
     }
     
     if (!err) {
@@ -473,27 +473,27 @@ static cc_uint32 cci_credentials_v5_read (cc_credentials_v5_t **out_v5creds,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v5creds->authtime);
+        err = krb5int_ipc_stream_read_time (io_stream, &v5creds->authtime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v5creds->starttime);
+        err = krb5int_ipc_stream_read_time (io_stream, &v5creds->starttime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v5creds->endtime);
+        err = krb5int_ipc_stream_read_time (io_stream, &v5creds->endtime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v5creds->renew_till);
+        err = krb5int_ipc_stream_read_time (io_stream, &v5creds->renew_till);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &v5creds->is_skey);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &v5creds->is_skey);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &v5creds->ticket_flags);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &v5creds->ticket_flags);
     }
     
     if (!err) {
@@ -533,11 +533,11 @@ static cc_uint32 cci_credentials_v5_write (cc_credentials_v5_t *in_v5creds,
     if (!in_v5creds) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, in_v5creds->client);
+        err = krb5int_ipc_stream_write_string (io_stream, in_v5creds->client);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, in_v5creds->server);
+        err = krb5int_ipc_stream_write_string (io_stream, in_v5creds->server);
     }
     
     if (!err) {
@@ -545,27 +545,27 @@ static cc_uint32 cci_credentials_v5_write (cc_credentials_v5_t *in_v5creds,
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v5creds->authtime);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->authtime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v5creds->starttime);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->starttime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v5creds->endtime);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->endtime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v5creds->renew_till);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->renew_till);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_v5creds->is_skey);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_v5creds->is_skey);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_v5creds->ticket_flags);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_v5creds->ticket_flags);
     }
     
     if (!err) {
@@ -629,7 +629,7 @@ cc_uint32 cci_credentials_union_read (cc_credentials_union **out_credentials_uni
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &credentials_union->version);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &credentials_union->version);
     }
     
     if (!err) {
@@ -668,7 +668,7 @@ cc_uint32 cci_credentials_union_write (const cc_credentials_union *in_credential
     if (!in_credentials_union) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_credentials_union->version);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_credentials_union->version);
     }
     
     if (!err) {