summaryrefslogtreecommitdiff
path: root/source4/smbd
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/smbd
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/smbd')
-rw-r--r--source4/smbd/service.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index 378ca1914d..2d532b638d 100644
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -148,7 +148,7 @@ struct server_stream_socket *service_setup_stream_socket(struct server_service *
stream_socket = talloc_zero(service, struct server_stream_socket);
if (!stream_socket) {
- DEBUG(0,("talloc_p(mem_ctx, struct server_stream_socket) failed\n"));
+ DEBUG(0,("talloc(mem_ctx, struct server_stream_socket) failed\n"));
socket_destroy(sock);
return NULL;
}
@@ -207,9 +207,9 @@ struct server_connection *server_setup_connection(struct event_context *ev,
struct timed_event idle;
struct server_connection *srv_conn;
- srv_conn = talloc_p(stream_socket, struct server_connection);
+ srv_conn = talloc(stream_socket, struct server_connection);
if (!srv_conn) {
- DEBUG(0,("talloc_p(mem_ctx, struct server_connection) failed\n"));
+ DEBUG(0,("talloc(mem_ctx, struct server_connection) failed\n"));
return NULL;
}