diff options
| author | Greg Hudson <ghudson@mit.edu> | 2008-11-05 17:08:47 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2008-11-05 17:08:47 +0000 |
| commit | ddf60ba5e894ad339c96c6f61446dfc8cb79e779 (patch) | |
| tree | 7c422431eee6bfe27aa691c05f8a1741b8934397 /src/lib/krb5 | |
| parent | 34bf3f538cc063b49fc9ac691d617522a7962e19 (diff) | |
| download | krb5-ddf60ba5e894ad339c96c6f61446dfc8cb79e779.tar.gz krb5-ddf60ba5e894ad339c96c6f61446dfc8cb79e779.tar.xz krb5-ddf60ba5e894ad339c96c6f61446dfc8cb79e779.zip | |
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
Diffstat (limited to 'src/lib/krb5')
| -rw-r--r-- | src/lib/krb5/krb/preauth.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/krb/srv_rcache.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/os/dnssrv.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/os/hst_realm.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/os/sendto_kdc.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c index 32249df87..11574116a 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 4ce073301..a426881d4 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 e10d01d04..4dcd57cb8 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 038348eae..2150ab38a 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 46ed6f6af..971047b54 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': |