diff options
author | Jeremy Allison <jra@samba.org> | 2007-09-14 23:21:00 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:06:46 -0500 |
commit | 9a012df08ee829c1d40fc88ba12a0ea479f60be0 (patch) | |
tree | 98fc38abc69111d06d29b0f7c57a5f3372bdcbed /source4/torture | |
parent | 6f37a17d4a66c67de974cec14ebdf627114a397e (diff) | |
download | samba-9a012df08ee829c1d40fc88ba12a0ea479f60be0.tar.gz samba-9a012df08ee829c1d40fc88ba12a0ea479f60be0.tar.bz2 samba-9a012df08ee829c1d40fc88ba12a0ea479f60be0.zip |
r25175: Change to talloc_asprintf_append_buffer().
Jeremy.
(This used to be commit 0844dbf597191b3e4d35a696695b229e986daec4)
Diffstat (limited to 'source4/torture')
-rw-r--r-- | source4/torture/basic/denytest.c | 2 | ||||
-rw-r--r-- | source4/torture/libnet/libnet_BecomeDC.c | 4 | ||||
-rw-r--r-- | source4/torture/rpc/session_key.c | 6 | ||||
-rw-r--r-- | source4/torture/rpc/srvsvc.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c index 05c613d647..7709ccebca 100644 --- a/source4/torture/basic/denytest.c +++ b/source4/torture/basic/denytest.c @@ -1645,7 +1645,7 @@ static const char *bit_string(TALLOC_CTX *mem_ctx, const struct bit_value *bv, i if (ret == NULL) { ret = talloc_asprintf(mem_ctx, "%s", bv[i].name); } else { - ret = talloc_asprintf_append(ret, " | %s", bv[i].name); + ret = talloc_asprintf_append_buffer(ret, " | %s", bv[i].name); } } } diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c index 9e870d9f26..c4b1a57ff1 100644 --- a/source4/torture/libnet/libnet_BecomeDC.c +++ b/source4/torture/libnet/libnet_BecomeDC.c @@ -345,7 +345,7 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s, tmp_dns_name = GUID_string(s_dsa->other_info, &s_dsa->source_dsa_obj_guid); NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name); - tmp_dns_name = talloc_asprintf_append(tmp_dns_name, "._msdcs.%s", c->forest->dns_name); + tmp_dns_name = talloc_asprintf_append_buffer(tmp_dns_name, "._msdcs.%s", c->forest->dns_name); NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name); s_dsa->other_info->dns_name = tmp_dns_name; @@ -642,7 +642,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data, tmp_dns_name = GUID_string(s_dsa->other_info, &s_dsa->source_dsa_obj_guid); NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name); - tmp_dns_name = talloc_asprintf_append(tmp_dns_name, "._msdcs.%s", c->forest->dns_name); + tmp_dns_name = talloc_asprintf_append_buffer(tmp_dns_name, "._msdcs.%s", c->forest->dns_name); NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name); s_dsa->other_info->dns_name = tmp_dns_name; diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c index a976d2fec2..ac65b80071 100644 --- a/source4/torture/rpc/session_key.c +++ b/source4/torture/rpc/session_key.c @@ -192,13 +192,13 @@ static struct torture_tcase *add_test(struct torture_suite *suite, uint32_t bind else name = talloc_strdup(suite, "unknown"); - name = talloc_asprintf_append(name, " keyexchange:%s", keyexchange?"yes":"no"); + name = talloc_asprintf_append_buffer(name, " keyexchange:%s", keyexchange?"yes":"no"); settings->keyexchange = keyexchange; - name = talloc_asprintf_append(name, " ntlm2:%s", ntlm2?"yes":"no"); + name = talloc_asprintf_append_buffer(name, " ntlm2:%s", ntlm2?"yes":"no"); settings->ntlm2 = ntlm2; - name = talloc_asprintf_append(name, " lm_key:%s", lm_key?"yes":"no"); + name = talloc_asprintf_append_buffer(name, " lm_key:%s", lm_key?"yes":"no"); settings->lm_key = lm_key; return torture_suite_add_simple_tcase(suite, name, test_secrets, settings); diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c index 6fa9d1b34b..1fe1221b0d 100644 --- a/source4/torture/rpc/srvsvc.c +++ b/source4/torture/rpc/srvsvc.c @@ -938,7 +938,7 @@ again: } if (!W_ERROR_IS_OK(r.out.result)) { - invalidc = talloc_asprintf_append(invalidc, "%c", (char)n); + invalidc = talloc_asprintf_append_buffer(invalidc, "%c", (char)n); } talloc_free(name); |