summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-27 07:08:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:15 -0500
commit759da3b915e2006d4c87b5ace47f399accd9ce91 (patch)
tree6bcaf9d4c0e38ef5e975c041d442c4437aa61e5a /source4/utils
parent1e42cacf6a8643bd633f631c212d71760852abbc (diff)
downloadsamba-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/utils')
-rw-r--r--source4/utils/net/net.c4
-rw-r--r--source4/utils/ntlm_auth.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 350ec251d9..7b716f0916 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -210,7 +210,7 @@ static int binary_net(int argc, const char **argv)
net_init_subsystems;
mem_ctx = talloc_init("net_context");
- ctx = talloc_p(mem_ctx, struct net_context);
+ ctx = talloc(mem_ctx, struct net_context);
if (!ctx) {
d_printf("talloc_init(net_context) failed\n");
exit(1);
@@ -228,7 +228,7 @@ static int binary_net(int argc, const char **argv)
DEBUG(0,("return code = %d\n", rc));
}
- talloc_destroy(mem_ctx);
+ talloc_free(mem_ctx);
return rc;
}
diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index 804c8d3c17..b5e3f3b3ea 100644
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -190,7 +190,7 @@ static NTSTATUS local_pw_check_specified(const char *username,
domain, username, workstation,
nt_errstr(nt_status)));
}
- talloc_destroy(mem_ctx);
+ talloc_free(mem_ctx);
}
if (error_string) {
*error_string = strdup(nt_errstr(nt_status));
@@ -779,7 +779,7 @@ static void manage_squid_request(enum stdio_helper_mode helper_mode,
return;
}
if (!mux_private) {
- mux_private = talloc_p(NULL, struct mux_private);
+ mux_private = talloc(NULL, struct mux_private);
mux_private->max_mux = 0;
mux_private->private_pointers = NULL;
}
@@ -790,7 +790,7 @@ static void manage_squid_request(enum stdio_helper_mode helper_mode,
unsigned int prev_max = mux_private->max_mux;
mux_private->max_mux = mux_id + 1;
mux_private->private_pointers
- = talloc_realloc_p(mux_private,
+ = talloc_realloc(mux_private,
mux_private->private_pointers,
void *, mux_private->max_mux);
memset(&mux_private->private_pointers[prev_max], '\0',