Rename krb5int_buf_cstr to krb5int_buf_data, since k5bufs can be used

for binary data as well as C string data.  The buffer will always have
a null byte at krb5int_buf_len bytes regardless of whether it contains
C string data.

ticket: 6200
status: open

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

9 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/crypto/t_hmac.c b/src/lib/crypto/t_hmac.c
index 63b90c7..bf629c3 100644
--- a/src/lib/crypto/t_hmac.c
+++ b/src/lib/crypto/t_hmac.c
@@ -245,7 +245,7 @@ static void test_hmac()
 	krb5int_buf_add(&buf, "0x");
 	for (j = 0; j < out.length; j++)
 	    krb5int_buf_add_fmt(&buf, "%02x", 0xff & outbuf[j]);
-	if (krb5int_buf_cstr(&buf) == NULL)
+	if (krb5int_buf_data(&buf) == NULL)
 	    abort();
 	if (strcmp(stroutbuf, md5tests[i].hexdigest)) {
 	    printf("*** CHECK FAILED!\n"
diff --git a/src/lib/gssapi/mechglue/oid_ops.c b/src/lib/gssapi/mechglue/oid_ops.c
index 44d79f3..9e77ef1 100644
--- a/src/lib/gssapi/mechglue/oid_ops.c
+++ b/src/lib/gssapi/mechglue/oid_ops.c
@@ -256,7 +256,7 @@ generic_gss_oid_to_str(minor_status, oid, oid_str)
 	}
     }
     krb5int_buf_add(&buf, "}");
-    bp = krb5int_buf_cstr(&buf);
+    bp = krb5int_buf_data(&buf);
     if (bp == NULL) {
 	*minor_status = ENOMEM;
 	return(GSS_S_FAILURE);
diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index 8fa742c..b6d8bdc 100644
--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
@@ -92,7 +92,7 @@ krb5_aprof_init(fname, envname, acontextp)
 	krb5int_buf_add(&buf, filenames[i]);
     }
     krb5_free_config_files(filenames);
-    profile_path = krb5int_buf_cstr(&buf);
+    profile_path = krb5int_buf_data(&buf);
     if (profile_path == NULL)
 	return ENOMEM;
     profile = (profile_t) NULL;
diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c
index 7ffcc8e..c35d515 100644
--- a/src/lib/kadm5/str_conv.c
+++ b/src/lib/kadm5/str_conv.c
@@ -188,7 +188,7 @@ krb5_flags_to_string(flags, sep, buffer, buflen)
 	    pflags |= flags_table[i].fl_flags;
 	}
     }
-    if (krb5int_buf_cstr(&buf) == NULL)
+    if (krb5int_buf_data(&buf) == NULL)
 	return(ENOMEM);
 
     /* See if there's any leftovers */
diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c
index 32249df..1157411 100644
--- a/src/lib/krb5/krb/preauth.c
+++ b/src/lib/krb5/krb/preauth.c
@@ -444,7 +444,7 @@ char *handle_sam_labels(krb5_sam_challenge *sc)
     }
     krb5int_buf_add_len(&buf, prompt, prompt_len);
     krb5int_buf_add(&buf, ": ");
-    return krb5int_buf_cstr(&buf);
+    return krb5int_buf_data(&buf);
 }
 
 /*
diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c
index 4ce0733..a426881 100644
--- a/src/lib/krb5/krb/srv_rcache.c
+++ b/src/lib/krb5/krb/srv_rcache.c
@@ -66,7 +66,7 @@ krb5_get_server_rcache(krb5_context context, const krb5_data *piece,
     krb5int_buf_add_fmt(&buf, "_%lu", uid);
 #endif
 
-    cachename = krb5int_buf_cstr(&buf);
+    cachename = krb5int_buf_data(&buf);
     if (cachename == NULL)
 	return ENOMEM;
 
diff --git a/src/lib/krb5/os/dnssrv.c b/src/lib/krb5/os/dnssrv.c
index e10d01d..4dcd57c 100644
--- a/src/lib/krb5/os/dnssrv.c
+++ b/src/lib/krb5/os/dnssrv.c
@@ -99,7 +99,7 @@ krb5int_make_srv_query_realm(const krb5_data *realm,
     if (len > 0 && host[len - 1] != '.')
 	krb5int_buf_add(&buf, ".");
 
-    if (krb5int_buf_cstr(&buf) == NULL)
+    if (krb5int_buf_data(&buf) == NULL)
 	return 0;
 
 #ifdef TEST
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index 038348e..2150ab3 100644
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -119,7 +119,7 @@ krb5_try_realm_txt_rr(const char *prefix, const char *name, char **realm)
 	if (len > 0 && host[len - 1] != '.')
 	    krb5int_buf_add(&buf, ".");
     }
-    if (krb5int_buf_cstr(&buf) == NULL)
+    if (krb5int_buf_data(&buf) == NULL)
 	return KRB5_ERR_HOST_REALM_UNKNOWN;
     ret = krb5int_dns_init(&ds, host, C_IN, T_TXT);
     if (ret < 0)
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 46ed6f6..971047b 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -240,8 +240,8 @@ krb5int_debug_fprint (const char *fmt, ...)
 		    krb5int_buf_add_fmt(&buf, " af%d", ai->ai_addr->sa_family);
 	    } else
 		krb5int_buf_add_fmt(&buf, " %s.%s", addrbuf, portbuf);
-	    if (krb5int_buf_cstr(&buf))
-		putstr(krb5int_buf_cstr(&buf));
+	    if (krb5int_buf_data(&buf))
+		putstr(krb5int_buf_data(&buf));
 	    krb5int_free_buf(&buf);
 	    break;
 	case 'D':