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/libnet | |
| 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/libnet')
| -rw-r--r-- | source4/libnet/libnet.c | 4 | ||||
| -rw-r--r-- | source4/libnet/libnet_join.c | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_passwd.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/libnet/libnet.c b/source4/libnet/libnet.c index 1462a63dd2..56b55426c0 100644 --- a/source4/libnet/libnet.c +++ b/source4/libnet/libnet.c @@ -28,7 +28,7 @@ struct libnet_context *libnet_context_init(void) mem_ctx = talloc_init("libnet_context"); - ctx = talloc_p(mem_ctx, struct libnet_context); + ctx = talloc(mem_ctx, struct libnet_context); if (!ctx) { return NULL; } @@ -40,7 +40,7 @@ struct libnet_context *libnet_context_init(void) void libnet_context_destroy(struct libnet_context **libnetctx) { - talloc_destroy((*libnetctx)->mem_ctx); + talloc_free((*libnetctx)->mem_ctx); (*libnetctx) = NULL; } diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 6d1003078d..bf8524c495 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -170,7 +170,7 @@ static NTSTATUS libnet_JoinDomain_samr(struct libnet_context *ctx, /* prepare samr_LookupNames */ ln.in.domain_handle = &d_handle; ln.in.num_names = 1; - ln.in.names = talloc_array_p(mem_ctx, struct samr_String, 1); + ln.in.names = talloc_array(mem_ctx, struct samr_String, 1); if (!ln.in.names) { r->samr.out.error_string = "Out of Memory"; return NT_STATUS_NO_MEMORY; diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c index 20be3a9dce..fb75f0eaaf 100644 --- a/source4/libnet/libnet_passwd.c +++ b/source4/libnet/libnet_passwd.c @@ -578,7 +578,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * /* prepare samr_LookupNames */ ln.in.domain_handle = &d_handle; ln.in.num_names = 1; - ln.in.names = talloc_array_p(mem_ctx, struct samr_String, 1); + ln.in.names = talloc_array(mem_ctx, struct samr_String, 1); if (!ln.in.names) { r->samr.out.error_string = "Out of Memory"; return NT_STATUS_NO_MEMORY; |