diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-27 07:08:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:15 -0500 |
| commit | 759da3b915e2006d4c87b5ace47f399accd9ce91 (patch) | |
| tree | 6bcaf9d4c0e38ef5e975c041d442c4437aa61e5a /source4/libcli/util | |
| parent | 1e42cacf6a8643bd633f631c212d71760852abbc (diff) | |
| download | samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.gz samba-759da3b915e2006d4c87b5ace47f399accd9ce91.tar.bz2 samba-759da3b915e2006d4c87b5ace47f399accd9ce91.zip | |
r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the
large commit. I thought this was worthwhile to get done for
consistency.
(This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0)
Diffstat (limited to 'source4/libcli/util')
| -rw-r--r-- | source4/libcli/util/asn1.c | 4 | ||||
| -rw-r--r-- | source4/libcli/util/clilsa.c | 4 | ||||
| -rw-r--r-- | source4/libcli/util/smbencrypt.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/libcli/util/asn1.c b/source4/libcli/util/asn1.c index de14eb0e57..550450fea7 100644 --- a/source4/libcli/util/asn1.c +++ b/source4/libcli/util/asn1.c @@ -59,7 +59,7 @@ BOOL asn1_push_tag(struct asn1_data *data, uint8_t tag) struct nesting *nesting; asn1_write_uint8(data, tag); - nesting = talloc_p(NULL, struct nesting); + nesting = talloc(NULL, struct nesting); if (!nesting) { data->has_error = True; return False; @@ -349,7 +349,7 @@ BOOL asn1_start_tag(struct asn1_data *data, uint8_t tag) data->has_error = True; return False; } - nesting = talloc_p(NULL, struct nesting); + nesting = talloc(NULL, struct nesting); if (!nesting) { data->has_error = True; return False; diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c index 40991a8855..0c0c64c0b4 100644 --- a/source4/libcli/util/clilsa.c +++ b/source4/libcli/util/clilsa.c @@ -53,7 +53,7 @@ static NTSTATUS smblsa_connect(struct smbcli_state *cli) return NT_STATUS_OK; } - lsa = talloc_p(cli, struct smblsa_state); + lsa = talloc(cli, struct smblsa_state); if (lsa == NULL) { return NT_STATUS_NO_MEMORY; } @@ -217,7 +217,7 @@ NTSTATUS smblsa_lookup_sid(struct smbcli_state *cli, names.names = NULL; sids.num_sids = 1; - sids.sids = talloc_p(mem_ctx2, struct lsa_SidPtr); + sids.sids = talloc(mem_ctx2, struct lsa_SidPtr); sids.sids[0].sid = sid; r.in.handle = &cli->lsa->handle; diff --git a/source4/libcli/util/smbencrypt.c b/source4/libcli/util/smbencrypt.c index bd2aae3db1..7e2890272c 100644 --- a/source4/libcli/util/smbencrypt.c +++ b/source4/libcli/util/smbencrypt.c @@ -344,7 +344,7 @@ static DATA_BLOB NTLMv2_generate_response(const uint8_t ntlm_v2_hash[16], memcpy(final_response.data+sizeof(ntlmv2_response), ntlmv2_client_data.data, ntlmv2_client_data.length); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); return final_response; } |