summaryrefslogtreecommitdiff
path: root/source4/ldap_server
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-06 02:32:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:20 -0500
commitcc55aef7c116d03ba2817625b0ba9edb378525e3 (patch)
treee36f5694a422c5b80cb1f631c9dd182994aab9e2 /source4/ldap_server
parent66bd6142a2fc4679e1d6cc98237a23927dda5f63 (diff)
downloadsamba-cc55aef7c116d03ba2817625b0ba9edb378525e3.tar.gz
samba-cc55aef7c116d03ba2817625b0ba9edb378525e3.tar.bz2
samba-cc55aef7c116d03ba2817625b0ba9edb378525e3.zip
r4547: - added talloc_new(ctx) macro that is a neater form of the common talloc(ctx, 0) call.
- cleaned up some talloc usage in various files I'd like to get to the point that we have no calls to talloc(), at which point we will rename talloc_p() to talloc(), to encourage everyone to use the typesafe functions. (This used to be commit e6c81d7c9f8a6938947d3c1c8a971a0d6d50b67a)
Diffstat (limited to 'source4/ldap_server')
-rw-r--r--source4/ldap_server/ldap_parse.c4
-rw-r--r--source4/ldap_server/ldap_server.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/ldap_server/ldap_parse.c b/source4/ldap_server/ldap_parse.c
index 269f51704c..d645d24104 100644
--- a/source4/ldap_server/ldap_parse.c
+++ b/source4/ldap_server/ldap_parse.c
@@ -80,7 +80,7 @@ static void ldap_parse_attributetypedescription(struct ldap_schema *schema, DATA
{
char *desc;
- desc = (char *)talloc(schema, data->lenght + 1);
+ desc = talloc_array_p(schema, char, data->lenght + 1);
memcpy(desc, data->data, data->lenght);
desc[data->lenght] = '\0';
@@ -90,7 +90,7 @@ static void ldap_parse_objectclassdescription(struct ldap_schema *schema, DATA_B
{
char *desc;
- desc = (char *)talloc(schema, data->lenght + 1);
+ desc = talloc_array_p(schema, char, data->lenght + 1);
memcpy(desc, data->data, data->lenght);
desc[data->lenght] = '\0';
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 0bace4b690..a301c14084 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -206,7 +206,7 @@ static BOOL ldapsrv_read_buf(struct ldapsrv_connection *conn)
return read_into_buf(sock, &conn->in_buffer);
}
- mem_ctx = talloc(conn, 0);
+ mem_ctx = talloc_new(conn);
if (!mem_ctx) {
DEBUG(0,("no memory\n"));
return False;
@@ -315,7 +315,7 @@ static BOOL ldapsrv_write_buf(struct ldapsrv_connection *conn)
return write_from_buf(sock, &conn->out_buffer);
}
- mem_ctx = talloc(conn, 0);
+ mem_ctx = talloc_new(conn);
if (!mem_ctx) {
DEBUG(0,("no memory\n"));
return False;