3 files changed, 16 insertions, 16 deletions

diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 63b7bf4da6..ebc9096b6a 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -276,8 +276,8 @@ k5buf_to_gss(OM_uint32 *minor,
              gss_buffer_t output_buffer)
 {
     OM_uint32 status = GSS_S_COMPLETE;
-    char *bp = krb5int_buf_data(input_k5buf);
-    output_buffer->length = krb5int_buf_len(input_k5buf);
+    char *bp = k5_buf_data(input_k5buf);
+    output_buffer->length = k5_buf_len(input_k5buf);
 #if defined(_WIN32) || defined(DEBUG_GSSALLOC)
     if (output_buffer->length > 0) {
         output_buffer->value = gssalloc_malloc(output_buffer->length);
@@ -290,7 +290,7 @@ k5buf_to_gss(OM_uint32 *minor,
     } else {
         output_buffer->value = NULL;
     }
-    krb5int_free_buf(input_k5buf);
+    k5_free_buf(input_k5buf);
 #else
     output_buffer->value = bp;
     /*
diff --git a/src/lib/gssapi/generic/oid_ops.c b/src/lib/gssapi/generic/oid_ops.c
index a03b6f8da2..1229f3842b 100644
--- a/src/lib/gssapi/generic/oid_ops.c
+++ b/src/lib/gssapi/generic/oid_ops.c
@@ -257,8 +257,8 @@ generic_gss_oid_to_str(OM_uint32 *minor_status,
 
     cp = (unsigned char *) oid->elements;
     number = (unsigned long) cp[0];
-    krb5int_buf_init_dynamic(&buf);
-    krb5int_buf_add(&buf, "{ ");
+    k5_buf_init_dynamic(&buf);
+    k5_buf_add(&buf, "{ ");
     number = 0;
     cp = (unsigned char *) oid->elements;
     first = 1;
@@ -267,16 +267,16 @@ generic_gss_oid_to_str(OM_uint32 *minor_status,
         if ((cp[i] & 0x80) == 0) {
             if (first) {
                 n = (number < 40) ? 0 : (number < 80) ? 1 : 2;
-                krb5int_buf_add_fmt(&buf, "%lu %lu ", n, number - (n * 40));
+                k5_buf_add_fmt(&buf, "%lu %lu ", n, number - (n * 40));
                 first = 0;
             } else {
-                krb5int_buf_add_fmt(&buf, "%lu ", number);
+                k5_buf_add_fmt(&buf, "%lu ", number);
             }
             number = 0;
         }
     }
-    krb5int_buf_add_len(&buf, "}\0", 2);
-    if (krb5int_buf_data(&buf) == NULL) {
+    k5_buf_add_len(&buf, "}\0", 2);
+    if (k5_buf_data(&buf) == NULL) {
         *minor_status = ENOMEM;
         return(GSS_S_FAILURE);
     }
diff --git a/src/lib/gssapi/mechglue/g_export_cred.c b/src/lib/gssapi/mechglue/g_export_cred.c
index de2e98d665..16d1ebef4c 100644
--- a/src/lib/gssapi/mechglue/g_export_cred.c
+++ b/src/lib/gssapi/mechglue/g_export_cred.c
@@ -73,7 +73,7 @@ gss_export_cred(OM_uint32 * minor_status, gss_cred_id_t cred_handle,
     if (status != GSS_S_COMPLETE)
         return status;
 
-    krb5int_buf_init_dynamic(&buf);
+    k5_buf_init_dynamic(&buf);
 
     cred = (gss_union_cred_t) cred_handle;
     for (i = 0; i < cred->count; i++) {
@@ -98,21 +98,21 @@ gss_export_cred(OM_uint32 * minor_status, gss_cred_id_t cred_handle,
 
         /* Append the mech OID and token to buf. */
         store_32_be(public_oid->length, lenbuf);
-        krb5int_buf_add_len(&buf, lenbuf, 4);
-        krb5int_buf_add_len(&buf, public_oid->elements, public_oid->length);
+        k5_buf_add_len(&buf, lenbuf, 4);
+        k5_buf_add_len(&buf, public_oid->elements, public_oid->length);
         store_32_be(mech_token.length, lenbuf);
-        krb5int_buf_add_len(&buf, lenbuf, 4);
-        krb5int_buf_add_len(&buf, mech_token.value, mech_token.length);
+        k5_buf_add_len(&buf, lenbuf, 4);
+        k5_buf_add_len(&buf, mech_token.value, mech_token.length);
         gss_release_buffer(&tmpmin, &mech_token);
     }
 
-    if (krb5int_buf_data(&buf) == NULL) {
+    if (k5_buf_data(&buf) == NULL) {
         *minor_status = ENOMEM;
         return GSS_S_FAILURE;
     }
     return k5buf_to_gss(minor_status, &buf, token);
 
 error:
-    krb5int_free_buf(&buf);
+    k5_free_buf(&buf);
     return status;
 }